[Swift-commit] r5175 - in branches/release-0.93/tests: . groups language/working language-behaviour/IO stress/persistent-coasters stress/persistent-coasters/many-jobs
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Mon Sep 26 20:30:18 CDT 2011
Author: davidk
Date: 2011-09-26 20:30:18 -0500 (Mon, 26 Sep 2011)
New Revision: 5175
Added:
branches/release-0.93/tests/language-behaviour/IO/testimport.setup.sh
branches/release-0.93/tests/language-behaviour/IO/testimport2.setup.sh
branches/release-0.93/tests/language/working/062-stdinerrout.setup.sh
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0001.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0002.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0003.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0004.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0005.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0006.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0007.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0008.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0009.out.expected
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.repeat
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.setup.sh
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.swift
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.timeout
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/coaster-service.conf
branches/release-0.93/tests/stress/persistent-coasters/many-jobs/data.txt
branches/release-0.93/tests/stress/persistent-coasters/pass-fail-pass/
Removed:
branches/release-0.93/tests/stress/persistent-coasters/catsn.0001.out.expected
branches/release-0.93/tests/stress/persistent-coasters/catsn.repeat
branches/release-0.93/tests/stress/persistent-coasters/catsn.setup.sh
branches/release-0.93/tests/stress/persistent-coasters/catsn.swift
branches/release-0.93/tests/stress/persistent-coasters/catsn.timeout
branches/release-0.93/tests/stress/persistent-coasters/coaster-service.conf
branches/release-0.93/tests/stress/persistent-coasters/data.txt
Modified:
branches/release-0.93/tests/groups/group-stress.sh
branches/release-0.93/tests/language/working/060-stdinouterr.setup.sh
branches/release-0.93/tests/suite.sh
Log:
Updates to test suite
Modified: branches/release-0.93/tests/groups/group-stress.sh
===================================================================
--- branches/release-0.93/tests/groups/group-stress.sh 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/groups/group-stress.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -2,7 +2,8 @@
# GROUPLIST definition to run all local tests
GROUPLIST=(
- $TESTDIR/stress/persistent-coasters \
+ $TESTDIR/stress/persistent-coasters/many-jobs \
+ $TESTDIR/stress/persistent-coasters/pass-fail-pass \
)
checkvars WORK
Modified: branches/release-0.93/tests/language/working/060-stdinouterr.setup.sh
===================================================================
--- branches/release-0.93/tests/language/working/060-stdinouterr.setup.sh 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/language/working/060-stdinouterr.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1 +1 @@
-cp $GROUP/test.in .
\ No newline at end of file
+cp -v $GROUP/test.in .
Added: branches/release-0.93/tests/language/working/062-stdinerrout.setup.sh
===================================================================
--- branches/release-0.93/tests/language/working/062-stdinerrout.setup.sh (rev 0)
+++ branches/release-0.93/tests/language/working/062-stdinerrout.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+cp -v $GROUP/test.in .
Property changes on: branches/release-0.93/tests/language/working/062-stdinerrout.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/release-0.93/tests/language-behaviour/IO/testimport.setup.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/IO/testimport.setup.sh (rev 0)
+++ branches/release-0.93/tests/language-behaviour/IO/testimport.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/testimport2.swift .
Property changes on: branches/release-0.93/tests/language-behaviour/IO/testimport.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/release-0.93/tests/language-behaviour/IO/testimport2.setup.sh
===================================================================
--- branches/release-0.93/tests/language-behaviour/IO/testimport2.setup.sh (rev 0)
+++ branches/release-0.93/tests/language-behaviour/IO/testimport2.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/testimport.swift .
Property changes on: branches/release-0.93/tests/language-behaviour/IO/testimport2.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Deleted: branches/release-0.93/tests/stress/persistent-coasters/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/catsn.0001.out.expected 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/catsn.0001.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1 +0,0 @@
-Hello world
Deleted: branches/release-0.93/tests/stress/persistent-coasters/catsn.repeat
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/catsn.repeat 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/catsn.repeat 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1 +0,0 @@
-1000
Deleted: branches/release-0.93/tests/stress/persistent-coasters/catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/catsn.setup.sh 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/catsn.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp $GROUP/coaster-service.conf .
-cp $GROUP/data.txt .
Deleted: branches/release-0.93/tests/stress/persistent-coasters/catsn.swift
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/catsn.swift 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/catsn.swift 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1,12 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","1"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Deleted: branches/release-0.93/tests/stress/persistent-coasters/catsn.timeout
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/catsn.timeout 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/catsn.timeout 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1 +0,0 @@
-999999
Deleted: branches/release-0.93/tests/stress/persistent-coasters/coaster-service.conf
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/coaster-service.conf 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/coaster-service.conf 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1,42 +0,0 @@
-# Keep all interesting settings in one place
-# User should modify this to fit environment
-
-# Location of SWIFT. If empty, PATH is searched
-export SWIFT=
-
-# Where to copy worker.pl on the remote machine for sites.xml
-export WORKER_WORK=$HOME/swiftwork
-
-# How to launch workers: local, ssh, cobalt, or futuregrid
-export WORKER_MODE=ssh
-
-# SSH hosts to start workers on (ssh mode only)
-export WORKER_HOSTS="localhost"
-
-# Do all the worker nodes you're using have a shared filesystem? (yes/no)
-export SHARED_FILESYSTEM=yes
-
-# Username to use on worker nodes
-export WORKER_USERNAME=$USER
-
-# Enable SSH tunneling? (yes/no)
-export SSH_TUNNELING=no
-
-# Directory to keep log files, relative to working directory when launching start-coaster-service
-export LOG_DIR=logs
-
-# Manually define ports. If not specified, an available port will be used
-export LOCAL_PORT=
-export SERVICE_PORT=
-
-# start-coaster-service tries to automatically detect the IP address of this system. Specify here if you have multiple network interfaces
-export IPADDR=
-
-# Location of the swift-vm-boot scripts
-export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot
-
-# Swift information for creating sites.xml
-export WORK=$HOME/swiftwork
-export QUEUE=prod-devel
-export MAXTIME=20
-export NODE=64
Deleted: branches/release-0.93/tests/stress/persistent-coasters/data.txt
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/data.txt 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/stress/persistent-coasters/data.txt 2011-09-27 01:30:18 UTC (rev 5175)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0001.out.expected (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0001.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0002.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0003.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0004.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0005.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0006.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0007.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0008.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Added: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.0009.out.expected 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.repeat (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/catsn.repeat)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.repeat (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.repeat 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+1000
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.setup.sh (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/catsn.setup.sh)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.setup.sh (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.setup.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp $GROUP/coaster-service.conf .
+cp $GROUP/data.txt .
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.swift (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/catsn.swift)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.swift (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.swift 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1,12 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.timeout (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/catsn.timeout)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.timeout (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/catsn.timeout 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+999999
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/coaster-service.conf (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/coaster-service.conf)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/coaster-service.conf (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/coaster-service.conf 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1,42 @@
+# Keep all interesting settings in one place
+# User should modify this to fit environment
+
+# Location of SWIFT. If empty, PATH is searched
+export SWIFT=
+
+# Where to copy worker.pl on the remote machine for sites.xml
+export WORKER_WORK=$HOME/swiftwork
+
+# How to launch workers: local, ssh, cobalt, or futuregrid
+export WORKER_MODE=ssh
+
+# SSH hosts to start workers on (ssh mode only)
+export WORKER_HOSTS="localhost"
+
+# Do all the worker nodes you're using have a shared filesystem? (yes/no)
+export SHARED_FILESYSTEM=yes
+
+# Username to use on worker nodes
+export WORKER_USERNAME=$USER
+
+# Enable SSH tunneling? (yes/no)
+export SSH_TUNNELING=no
+
+# Directory to keep log files, relative to working directory when launching start-coaster-service
+export LOG_DIR=logs
+
+# Manually define ports. If not specified, an available port will be used
+export LOCAL_PORT=
+export SERVICE_PORT=
+
+# start-coaster-service tries to automatically detect the IP address of this system. Specify here if you have multiple network interfaces
+export IPADDR=
+
+# Location of the swift-vm-boot scripts
+export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot
+
+# Swift information for creating sites.xml
+export WORK=$HOME/swiftwork
+export QUEUE=prod-devel
+export MAXTIME=20
+export NODE=64
Copied: branches/release-0.93/tests/stress/persistent-coasters/many-jobs/data.txt (from rev 5172, branches/release-0.93/tests/stress/persistent-coasters/data.txt)
===================================================================
--- branches/release-0.93/tests/stress/persistent-coasters/many-jobs/data.txt (rev 0)
+++ branches/release-0.93/tests/stress/persistent-coasters/many-jobs/data.txt 2011-09-27 01:30:18 UTC (rev 5175)
@@ -0,0 +1 @@
+Hello world
Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh 2011-09-26 19:35:12 UTC (rev 5174)
+++ branches/release-0.93/tests/suite.sh 2011-09-27 01:30:18 UTC (rev 5175)
@@ -117,6 +117,7 @@
SEQ=1
DATE=$( date +"%Y-%m-%d" )
TIME=$( date +"%T" )
+HOURMINSEC=$( date +"%H%M%S" )
RUNDIRBASE="run-$DATE"
RUNDIR=$TOPDIR/$RUNDIRBASE
@@ -356,7 +357,7 @@
LABEL="$2" # Text on link to output
CMD=$3 # Command issued (td title)
RESULT=$4 # Passed or Failed
-
+
if [ $TEXTREPORT == 1 ]; then
if [ "$TYPE" == "test" ]; then
if [ "$RESULT" == "Passed" ]; then
@@ -377,7 +378,7 @@
# WIDTH=$( width "$LABEL" )
if [ "$RESULT" == "Passed" ]; then
html_td class "success" width 25 title "$CMD"
- html_a_href $OUTPUT "$LABEL"
+ html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"
elif [ "$RESULT" == "None" ]; then
html_td width 25
html " "
@@ -386,7 +387,7 @@
echo -e "${RED}FAILED${GRAY}"
cat $RUNDIR/$OUTPUT < /dev/null
html_td class "failure" width 25 title "$CMD"
- html_a_href $OUTPUT $LABEL
+ html_a_href "$TESTNAMEDIR/$OUTPUT" "$LABEL"
fi
html_~td
elif [ "$TYPE" == "package" ]; then
@@ -696,7 +697,7 @@
process_exec $SCRIPT
RESULT=$( result )
-
+
output_report test "$SYMBOL" "$LASTCMD" $RESULT
check_bailout
@@ -705,11 +706,10 @@
stage_files() {
GROUP=$1
NAME=$2
-
RESULT="None"
-
- if [ -f $GROUP/$NAME.in ]; then
- echo "Copying input: $NAME.in"
+
+ if [ -f "$GROUP/$NAME.in" ]; then
+ echo "Copying input: $NAME.in"
cp -v $GROUP/$NAME.in . 2>&1 >> $OUTPUT
if [ "$?" != 0 ]; then
RESULT="Failed"
@@ -718,9 +718,10 @@
RESULT="Passed"
fi
fi
+
for INPUT in $GROUP/$NAME.*.in; do
IN=`basename $INPUT`
- echo "Copying input: $IN"
+ echo "Copying input: $IN"
cp -v $INPUT . 2>&1 >> $OUTPUT
if [ "$?" != 0 ]; then
RESULT="Failed"
@@ -771,7 +772,6 @@
swift_test_case() {
SWIFTSCRIPT=$1
NAME=${SWIFTSCRIPT%.swift}
-
SETUPSCRIPT=$NAME.setup.sh
CHECKSCRIPT=$NAME.check.sh
CLEANSCRIPT=$NAME.clean.sh
@@ -779,7 +779,7 @@
ARGSFILE=$NAME.args
TEST_SHOULD_FAIL=0
-
+
OUTPUT=$NAME.setup.stdout
if [ -x $GROUP/$SETUPSCRIPT ]; then
script_exec $GROUP/$SETUPSCRIPT "S"
@@ -799,7 +799,7 @@
TIMEOUT=$( gettimeout $GROUP/$TIMEOUTFILE )
- grep THIS-SCRIPT-SHOULD-FAIL $SWIFTSCRIPT > /dev/null
+ grep THIS-SCRIPT-SHOULD-FAIL $GROUP/$SWIFTSCRIPT > /dev/null
TEST_SHOULD_FAIL=$(( ! $? ))
OUTPUT=$NAME.stdout
@@ -1065,43 +1065,48 @@
# Execute all tests in current GROUP
test_group() {
- group_swift_properties
- group_sites_xml
- group_tc_data
- group_fs_data
SWIFTS=$( echo $GROUP/*.swift )
checkfail "Could not list: $GROUP"
for TEST in $SWIFTS; do
-
+
(( SKIP_COUNTER++ < SKIP_TESTS )) && continue
TESTNAME=$( basename $TEST )
+ TESTNAMEDIR=`basename $TESTNAME .swift`-$DATE-$HOURMINSEC
+ mkdir -p $TESTNAMEDIR
+ pushd $TESTNAMEDIR > /dev/null 2>&1
- echo
- echo
- echo "/--------------------------------------------------------------"
+ cp $TEST .
+ group_swift_properties
+ group_sites_xml
+ group_tc_data
+ group_fs_data
+
+ echo
+ echo
+ echo "/--------------------------------------------------------------"
echo -e "| Test case: $LGREEN$TESTNAME$GRAY"
- echo "\--------------------------------------------------------------"
+ echo "\--------------------------------------------------------------"
echo
- cp $GROUP/$TESTNAME .
- TESTLINK=$TESTNAME
-
# Use repeat.txt to determine number of test iterations
SCRIPT_BASENAME=`basename $TESTNAME .swift`
+ TESTLINK="$TESTNAMEDIR/$TESTNAME"
if [ -f "$GROUP/$SCRIPT_BASENAME.repeat" ]; then
ITERS_LOCAL=`cat $GROUP/$SCRIPT_BASENAME.repeat`
fi
for (( i=0; $i<$ITERS_LOCAL; i=$i+1 )); do
+ HOURMINSEC=$( date +"%H%M%S" )
start_row
swift_test_case $TESTNAME
(( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return
(( $SHUTDOWN )) && return
end_row
done
+ popd > /dev/null 2>&1
done
group_statistics
TOTAL_TIME=0
@@ -1118,7 +1123,7 @@
TESTNAME=$( basename $TEST )
cp -v $GROUP/$TESTNAME .
- TESTLINK=$TESTNAME
+ TESTLINK="$TESTNAMEDIR/$TESTNAME"
start_row
for ((i=0; $i<$ITERS_LOCAL; i=$i+1)); do
More information about the Swift-commit
mailing list