From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 8 Apr 2007 03:16:11 +0000 (-0400)
Subject: Make the test_script ignore and skip empty test directories
X-Git-Tag: E2FSPROGS-1_40~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62fc8cef4532570f07c4c5aa522f5a31f5b99d3a;p=thirdparty%2Fe2fsprogs.git

Make the test_script ignore and skip empty test directories

When patching and unpatching quilt files, empty directories get left
behind in the tests/ directory.  Ignore them to avoid false test
failures.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 98e1b7533..b867512f2 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-07  Theodore Tso  <tytso@mit.edu>
+
+	* test_script.in: Skip completely empty directories
+
 2007-04-01  Theodore Tso  <tytso@mit.edu>
 
 	* f_dir_bad_mode: New test case.
diff --git a/tests/test_script.in b/tests/test_script.in
index b8cecb313..9dbbaf84f 100644
--- a/tests/test_script.in
+++ b/tests/test_script.in
@@ -41,6 +41,9 @@ do
 		echo "The test '$test_name' does not exist."
 		continue;
 	fi
+	if [ -z "`ls $test_dir`" ]; then
+		continue
+	fi
 	if [ -f $test_dir/name ]; then
 		test_description=`cat $test_dir/name`
 		printf "%s: %s: " "$test_name" "$test_description"