summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-11-18 15:18:02 +0100
committerDavid Sterba <dsterba@suse.com>2016-11-23 10:51:43 +0100
commit4884ae2f5e87e1cfbf7cc1d5624e0600b1fa46b3 (patch)
tree079104e1620feb45b498bac00f1218ec868252d2
parent7cd40e125b42831f1cda999a5d206739853120fd (diff)
btrfs-progs: tests: enhance TEST_LOG features
Add new keyword to dump the log file after any test fails. Can be useful for remote analysis of test failures. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--Makefile.in5
-rw-r--r--tests/README.md10
-rwxr-xr-xtests/cli-tests.sh3
-rwxr-xr-xtests/convert-tests.sh3
-rwxr-xr-xtests/fsck-tests.sh3
-rwxr-xr-xtests/fuzz-tests.sh3
-rwxr-xr-xtests/misc-tests.sh3
-rwxr-xr-xtests/mkfs-tests.sh3
8 files changed, 30 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 4bd3e63..cba8f36 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,11 @@
# EXTRA_CFLAGS additional compiler flags
# EXTRA_LDFLAGS additional linker flags
#
+# Testing-specific options (see also tests/README.md):
+# TEST=GLOB run test(s) from directories matching GLOB
+# TEST_LOG=tty print name of a command run via the execution helpers
+# TEST_LOG=dump dump testing log file when a test fails
+#
# Static checkers:
# CHECKER static checker binary to be called (default: sparse)
# CHECKER_FLAGS flags to pass to CHECKER, can override CFLAGS
diff --git a/tests/README.md b/tests/README.md
index ca45cf6..f0d54d5 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -108,9 +108,13 @@ the root helper).
### Verbosity
-Setting the variable `TEST_LOG=tty` will print all commands executed by some of
-the wrappers (`run_check` etc), other commands are not printed to the terminal
-(but the full output is in the log).
+* `TEST_LOG=tty` -- setting the variable will print all commands executed by
+ some of the wrappers (`run_check` etc), other commands are not printed to the
+ terminal (but the full output is in the log)
+
+* `TEST_LOG=dump` -- dump the entire testing log when a test fails
+
+Multiple values can be separated by `,`.
### Permissions
diff --git a/tests/cli-tests.sh b/tests/cli-tests.sh
index bc1a1e2..16d6afc 100755
--- a/tests/cli-tests.sh
+++ b/tests/cli-tests.sh
@@ -34,6 +34,9 @@ do
echo " [TEST/cli] $name"
./test.sh
if [ $? -ne 0 ]; then
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
_fail "test failed for case $(basename $i)"
fi
fi
diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh
index 5fa88a1..c566336 100755
--- a/tests/convert-tests.sh
+++ b/tests/convert-tests.sh
@@ -37,6 +37,9 @@ run_one_test() {
./test.sh
if [ $? -ne 0 ]; then
_fail "test failed for case $testname"
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
fi
else
_fail "custom test script not found"
diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh
index e71b711..d5fc3d1 100755
--- a/tests/fsck-tests.sh
+++ b/tests/fsck-tests.sh
@@ -36,6 +36,9 @@ run_one_test() {
# Type 2
./test.sh
if [ $? -ne 0 ]; then
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
_fail "test failed for case $(basename $testname)"
fi
else
diff --git a/tests/fuzz-tests.sh b/tests/fuzz-tests.sh
index 9b88aa1..f72385e 100755
--- a/tests/fuzz-tests.sh
+++ b/tests/fuzz-tests.sh
@@ -33,6 +33,9 @@ do
echo " [TEST/fuzz] $name"
./test.sh
if [ $? -ne 0 ]; then
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
_fail "test failed for case $(basename $i)"
fi
fi
diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh
index 40e1cba..1c645c9 100755
--- a/tests/misc-tests.sh
+++ b/tests/misc-tests.sh
@@ -37,6 +37,9 @@ do
if [ -x test.sh ]; then
./test.sh
if [ $? -ne 0 ]; then
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
_fail "test failed for case $(basename $i)"
fi
fi
diff --git a/tests/mkfs-tests.sh b/tests/mkfs-tests.sh
index c130520..c8ff8c8 100755
--- a/tests/mkfs-tests.sh
+++ b/tests/mkfs-tests.sh
@@ -34,6 +34,9 @@ do
if [ -x test.sh ]; then
./test.sh
if [ $? -ne 0 ]; then
+ if [[ $TEST_LOG =~ dump ]]; then
+ cat "$RESULTS"
+ fi
_fail "test failed for case $(basename $i)"
fi
fi