diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-08 17:41:05 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-08 17:41:05 -0400 |
| commit | 560a0f99a48d0519c26903af9b81229db3b22206 (patch) | |
| tree | d96da6a651819473ad5d93f67efb527eb6c55901 /lib | |
| parent | ac144c41ad8afc7fbaab7cacdc708972aa22a476 (diff) | |
Disable ktest_crashdump, fix error handling
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.sh | 25 | ||||
| -rw-r--r-- | lib/parse-test.sh | 1 | ||||
| -rwxr-xr-x | lib/testrunner | 3 | ||||
| -rw-r--r-- | lib/util.sh | 23 |
4 files changed, 26 insertions, 26 deletions
diff --git a/lib/common.sh b/lib/common.sh index 3322375..75af866 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,4 +1,29 @@ +set -o nounset +set -o errtrace +set -o errtrace + +ktest_tmp=${ktest_tmp:-""} +ktest_exit() +{ + local children=$(jobs -rp) + if [[ -n $children ]]; then + kill -9 $children >& /dev/null + wait $(jobs -rp) >& /dev/null + fi + + [[ -n $ktest_tmp ]] && rm -rf "$ktest_tmp" +} + +trap ktest_exit EXIT + +get_tmpdir() +{ + if [[ -z $ktest_tmp ]]; then + ktest_tmp=$(mktemp --tmpdir -d $(basename "$0")-XXXXXXXXXX) + fi +} + log_verbose() { if [[ $ktest_verbose != 0 ]]; then diff --git a/lib/parse-test.sh b/lib/parse-test.sh index d74e2c5..a529901 100644 --- a/lib/parse-test.sh +++ b/lib/parse-test.sh @@ -3,6 +3,7 @@ parse_test_deps() { ktest_basename=$(basename -s .ktest "$ktest_test") + #export ktest_crashdump eval $("$ktest_test" deps) parse_arch "$ktest_arch" diff --git a/lib/testrunner b/lib/testrunner index bebadfa..3961d6a 100755 --- a/lib/testrunner +++ b/lib/testrunner @@ -6,10 +6,7 @@ set -o nounset set -o errexit set -o errtrace -trap 'echo "Error $? from: $BASH_COMMAND, exiting" >&2' ERR - export PS4='+`basename ${BASH_SOURCE[0]}`:${LINENO}:${FUNCNAME[0]:+${FUNCNAME[0]}()}+ ' - KERNEL_ARCH="" . /host/$ktest_env diff --git a/lib/util.sh b/lib/util.sh index ac09a4e..115bbd6 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -1,29 +1,6 @@ . "$ktest_dir/lib/common.sh" -ktest_no_cleanup_tmpdir="" -ktest_tmp=${ktest_tmp:-""} - -ktest_exit() -{ - local children=$(jobs -rp) - if [[ -n $children ]]; then - kill -9 $children >& /dev/null - wait $(jobs -rp) >& /dev/null - fi - - [[ -n $ktest_tmp && -z $ktest_no_cleanup_tmpdir ]] && rm -rf "$ktest_tmp" -} - -trap ktest_exit EXIT - -get_tmpdir() -{ - if [[ -z $ktest_tmp ]]; then - ktest_tmp=$(mktemp --tmpdir -d $(basename "$0")-XXXXXXXXXX) - fi -} - checkdep_arch() { if [[ -z $ktest_root_image ]]; then |