introduced subdirectory structure

testing/do-tests

@@ -144,9 +144,21 @@ else
     TESTS="`ls $DEFAULTTESTSDIR`"
 fi
 
-for testname in $TESTS
+for SUBDIR in $TESTS
 do
+    SUBTESTS="`basename $SUBDIR`"
+
+    if [ $SUBTESTS = $SUBDIR ]
+    then
+	SUBTESTS="`ls $DEFAULTTESTSDIR/$SUBDIR`"
+    else
+	SUBDIR="`dirname $SUBDIR`"
+    fi
+
+    for name in $SUBTESTS
+    do
 	let "testnumber += 1"
+	testname=$SUBDIR/$name
 	cecho-n " $testnumber $testname.."
 
 	if [ ! -d $DEFAULTTESTSDIR/${testname} ]
@@ -162,13 +174,15 @@ do
 	[ -f $DEFAULTTESTSDIR/${testname}/evaltest.dat ]    || die "!! File 'evaltest.dat' is missing"
 
 	TESTRESULTDIR=$TODAYDIR/$testname
-    mkdir $TESTRESULTDIR
+	mkdir -p $TESTRESULTDIR
 	CONSOLE_LOG=$TESTRESULTDIR/console.log
 	touch $CONSOLE_LOG
 
 	TESTDIR=$TESTSDIR/${testname}
-    rm -rf $TESTDIR/*
+	rm -rf $TESTDIR
-    cp -rfp $DEFAULTTESTSDIR/${testname} $TESTSDIR
+	mkdir -p $TESTDIR
+	cp -rfp $DEFAULTTESTSDIR/${testname}/* $TESTDIR
+
 
 	##############################################################################
 	# replace IP wildcards with actual IPv4 and IPv6 addresses
@@ -208,14 +222,14 @@ do
 		searchandreplace PH_IP6_CAROL    $ipv6_carol  $TESTDIR
 		;;
 	    dave)
-	    searchandreplace PH_IP_DAVE1     $ipv4_dave1 $TESTSDIR
+		searchandreplace PH_IP_DAVE1     $ipv4_dave1 $TESTDIR
-	    searchandreplace PH_IP_DAVE      $ipv4_dave  $TESTSDIR
+		searchandreplace PH_IP_DAVE      $ipv4_dave  $TESTDIR
-	    searchandreplace PH_IP6_DAVE1    $ipv6_dave1 $TESTSDIR
+		searchandreplace PH_IP6_DAVE1    $ipv6_dave1 $TESTDIR
-	    searchandreplace PH_IP6_DAVE     $ipv6_dave  $TESTSDIR
+		searchandreplace PH_IP6_DAVE     $ipv6_dave  $TESTDIR
 		;;
 	    winnetou)
-	    searchandreplace PH_IP_WINNETOU  $ipv4_winnetou $TESTSDIR
+		searchandreplace PH_IP_WINNETOU  $ipv4_winnetou $TESTDIR
-	    searchandreplace PH_IP6_WINNETOU $ipv6_winnetou $TESTSDIR
+		searchandreplace PH_IP6_WINNETOU $ipv6_winnetou $TESTDIR
 		;;
 	    esac
 	done
@@ -248,6 +262,7 @@ do
 	    done
 	fi
 
+
 	##########################################################################
 	# execute pre-test commands
 	#
@@ -309,7 +324,6 @@ do
 		printf("if [ \044cmd_exit -eq 0 -a \"%s\" = \"NO\"  ] ", hit)
 		printf("|| [ \044cmd_exit -ne 0 -a \"%s\" = \"YES\" ] ", hit)
 		printf("; then STATUS=\"failed\"; fi; \n")
-
 	    }
 	}' $TESTDIR/evaltest.dat` >> $CONSOLE_LOG 2>&1
 
@@ -352,7 +366,6 @@ do
     <img src="../images/$DIAGRAM" alt="$UMLHOSTS">
 @EOF
 
-
 	for host in $IPSECHOSTS
 	do
 	    eval HOSTLOGIN=root@\$ipv4_${host}
@@ -467,6 +480,7 @@ do
   </tr>
 @EOF
 
+    done
 done