tests: simplify teardown

If TESTNAME has not been created yet, avoid running complex teardown.

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 737050d51008940f549e9382644ae4cb64f14776..15a689ad530eb3b58a91c9bb4d43d46a6c4ae4c8 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -254,6 +254,8 @@ kill_listed_processes() {
 teardown() {
        echo -n "## teardown..."
 
+       if test -f TESTNAME ; then
+
        kill_listed_processes
 
        kill_sleep_kill_ LOCAL_LVMETAD ${LVM_VALGRIND_LVMETAD:-0}
@@ -277,6 +279,8 @@ teardown() {
 
        echo -n .
 
+       fi
+
        test -n "$TESTDIR" && {
                cd "$TESTOLDPWD"
                rm -rf "$TESTDIR" || echo BLA

diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 87152a43491bffbdb8d402cfd21adabd81cbf04d..a6106323f4b2007eb4701e673a534d25371a8d33 100644 (file)
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -134,7 +134,7 @@ STACKTRACE() {
 
        test -f SKIP_THIS_TEST && exit 200
 
-       test -z "$LVM_TEST_NODEBUG" && {
+       test -z "$LVM_TEST_NODEBUG" -a -f TESTNAME && {
                local name
                local idx
                for i in debug.log* ; do