diff options
| -rw-r--r-- | testing/Makefile.am | 10 | ||||
| -rwxr-xr-x | testing/do-tests (renamed from testing/do-tests.in) | 13 |
2 files changed, 7 insertions, 16 deletions
diff --git a/testing/Makefile.am b/testing/Makefile.am index 2aa7d70bc..77e279b76 100644 --- a/testing/Makefile.am +++ b/testing/Makefile.am @@ -1,11 +1,3 @@ -noinst_SCRIPTS = do-tests -CLEANFILES = do-tests -EXTRA_DIST = do-tests.in make-testing start-testing stop-testing \ +EXTRA_DIST = do-tests make-testing start-testing stop-testing \ testing.conf ssh_config hosts images scripts tests INSTALL README -do-tests : do-tests.in - sed \ - -e "s:\@routing_table\@:$(routing_table):" \ - $(srcdir)/$@.in > $@ - chmod +x $@ - diff --git a/testing/do-tests.in b/testing/do-tests index 137bb31fb..f0b654a07 100755 --- a/testing/do-tests.in +++ b/testing/do-tests @@ -46,7 +46,7 @@ TESTRESULTSHTML=$TODAYDIR/all.html INDEX=$TODAYDIR/index.html DEFAULTTESTSDIR=$UMLTESTDIR/testing/tests -SOURCEIP_ROUTING_TABLE=@routing_table@ +SOURCEIP_ROUTING_TABLE=220 testnumber="0" failed_cnt="0" @@ -137,7 +137,7 @@ ENVIRONMENT_HEADER=$(cat <<@EOF </tr> <tr> <td width="100"> </td> - <td width="200"> </td> + <td width="300"> </td> <td width=" 50"> </td> <td > </td> </tr> @@ -208,7 +208,7 @@ do mkdir $TODAYDIR/$SUBDIR if [ $testnumber == 0 ] then - FIRST="<b>Category:</b" + FIRST="<b>Category:</b>" else FIRST=" " fi @@ -242,7 +242,7 @@ do </tr> <tr> <td width="100"> </td> - <td width="200"> </td> + <td width="300"> </td> <td width=" 50"> </td> <td > </td> </tr> @@ -507,7 +507,7 @@ do done scp $SSHCONF $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \ - $TESTRESULTDIR/${host}.ipsec.sql > /dev/null 2>&1 + $TESTRESULTDIR/${host}.ipsec.sql > /dev/null 2>&1 ssh $SSHCONF $HOSTLOGIN ip -s xfrm policy \ > $TESTRESULTDIR/${host}.ip.policy 2>/dev/null @@ -566,7 +566,7 @@ do $TESTRESULTDIR/${host}.strongswan.conf > /dev/null 2>&1 scp $SSHCONF $HOSTLOGIN:/var/log/freeradius/radius.log \ - $TESTRESULTDIR/${host}.radius.log > /dev/null 2>&1 + $TESTRESULTDIR/${host}.radius.log > /dev/null 2>&1 chmod a+r $TESTRESULTDIR/* cat >> $TESTRESULTDIR/index.html <<@EOF @@ -783,4 +783,3 @@ for host in $STRONGSWANHOSTS do kill `eval echo \\\$ssh_pid_$host` done - |