1 files changed, 7 insertions, 64 deletions

diff --git a/tests/test_script.in b/tests/test_script.in
index b7ac86e3..41ad104b 100644
--- a/tests/test_script.in
+++ b/tests/test_script.in
@@ -1,12 +1,8 @@
 #!/bin/sh
+# Run all or specified test scripts
 #
-# Test script for e2fsck
-#
-
-LC_ALL=C
-export LC_ALL
 
-case "$1" in 
+case "$1" in
     --valgrind)
     	export USE_VALGRIND="valgrind -q --sim-hints=lax-ioctls"
 	shift;
@@ -18,72 +14,19 @@ case "$1" in
 esac
 
 if test "$1"x = x ; then
-  TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | $EGREP -v "\.failed|\.new"`
+  TESTS=`ls -d $SRCDIR/[a-zA-Z]_*`
 else
   TESTS=
-  for i 
-  do
+  for i; do
     case $i in
-	*.failed|*.new)	continue ;;
 	[a-zA-Z])	TESTS="$TESTS $SRCDIR/${i}_*" ;;
 	*)		TESTS="$TESTS $SRCDIR/$i" ;;
     esac
   done
 fi
 
-cmd_dir=$SRCDIR
-
-if test "$TEST_CONFIG"x = x; then
-	TEST_CONFIG=$SRCDIR/test_config
-fi
-
-. $TEST_CONFIG
-
-TMPFILE=$(mktemp)
-
-for test_dir in $TESTS
-do
-	test_name=`echo $test_dir | sed -e 's;.*/;;'`
-	if [ -f $test_dir ] ; then
-	    continue;
-	fi
-	if [ ! -d $test_dir ] ; then
-		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"
-	else
-		printf "%s: " "$test_name"
-	fi
-	if [ -f $test_dir/script ]; then
-		. $test_dir/script
-	else
-		test_base=`echo $test_name | sed -e 's/_.*//'`
-		default_script=$SRCDIR/defaults/${test_base}_script
-		if [ -f $default_script ]; then
-			. $SRCDIR/defaults/${test_base}_script
-		else
-			echo "Missing test script!"
-		fi
-	fi
-done
-
-num_ok=`ls *.ok 2>/dev/null | wc -l`
-num_failed=`ls *.failed 2>/dev/null | wc -l`
-
-echo "$num_ok tests succeeded	$num_failed tests failed"
-
-test "$num_failed" -eq 0 && exit 0
-
-echo -n "Tests failed: "
-for fname in $(ls *.failed); do
-	echo -n "${fname%%.failed} "
+for test_dir in $TESTS; do
+	./test_one $test_dir
 done
-echo ""
 
-exit 1
+$SRCDIR/test_post