Disable ktest_crashdump, fix error handling

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

6 files changed, 31 insertions, 33 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
diff --git a/tests/kconfig.sh b/tests/kconfig.sh
index 1719eea..5cb3f2f 100644
--- a/tests/kconfig.sh
+++ b/tests/kconfig.sh
@@ -167,11 +167,11 @@ require-kernel-config 9P_FS
 require-kernel-config CONFIG_CRYPTO_DEV_VIRTIO
 
 # Crash dumps
-if [[ $ktest_crashdump = 1 ]]; then
-    require-kernel-config KEXEC
-    require-kernel-config CRASH_DUMP
-    require-kernel-config RELOCATABLE
-fi
+#if [[ $ktest_crashdump = 1 ]]; then
+#    require-kernel-config KEXEC
+#    require-kernel-config CRASH_DUMP
+#    require-kernel-config RELOCATABLE
+#fi
 
 # KGDB:
 require-kernel-config KGDB
diff --git a/tests/prelude.sh b/tests/prelude.sh
index f6fd234..9464fdb 100644
--- a/tests/prelude.sh
+++ b/tests/prelude.sh
@@ -2,8 +2,6 @@
 
 . $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../lib/common.sh
 
-trap 'echo "Error $? from: $BASH_COMMAND, exiting" >&2' ERR
-
 if [[ ! -v ktest_verbose ]]; then
     ktest_verbose=0
     ktest_cpus=$(nproc)