From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174

Reorg more of the test variables, still separating source and test directories.
More minor fixes from me.

svn path=/trunk/; revision=52412

1 files changed, 5 insertions, 3 deletions

diff --git a/test/test.sh b/test/test.sh
index 47e2465655..36e51f2644 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -84,10 +84,12 @@ fi
 
 test_cleanup() {
 	if [ $TEST_OUTDIR_CLEAN = 1 ]; then
-		# display contents of test outputs
-		grep -r . .
+		# display contents of test outputs, ignore directory:
+		# home (decryption suite)
+		grep -r . --exclude-dir=home .
 		rm -rf "$TEST_OUTDIR"
-	else
+	elif ! rmdir "$TEST_OUTDIR" 2>/dev/null; then
+		# if directory is non-empty, print directory
 		echo "Test results are available in $TEST_OUTDIR"
 	fi
 }