[Swift-commit] r7294 - in trunk: bin tests/documentation/tutorial tests/language-behaviour tests/language-behaviour/IO tests/language-behaviour/arrays tests/language-behaviour/datatypes tests/language-behaviour/math tests/language-behaviour/procedures tests/language-behaviour/strings tests/language-behaviour/variables tests/local

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Mon Nov 18 12:25:33 CST 2013


Author: davidk
Date: 2013-11-18 12:25:32 -0600 (Mon, 18 Nov 2013)
New Revision: 7294

Removed:
   trunk/bin/nswift
   trunk/tests/language-behaviour/IO/tc.template.mix.data
   trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh
   trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh
   trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh
   trunk/tests/language-behaviour/generate-tc.data
   trunk/tests/language-behaviour/procedures/tc.template.mix.data
   trunk/tests/language-behaviour/strings/761-dirname.clean.sh
   trunk/tests/language-behaviour/tc.template.data
   trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh
   trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh
Modified:
   trunk/bin/swift
   trunk/tests/documentation/tutorial/sequential_iteration.setup.sh
   trunk/tests/language-behaviour/arrays/020-array.clean.sh
   trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
   trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
   trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh
   trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh
   trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh
   trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh
   trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh
   trunk/tests/language-behaviour/arrays/q5.clean.sh
   trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh
   trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh
   trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh
   trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh
   trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh
   trunk/tests/language-behaviour/math/006-add.clean.sh
   trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh
   trunk/tests/language-behaviour/math/008-add-multiply.clean.sh
   trunk/tests/language-behaviour/math/009-multiply.clean.sh
   trunk/tests/language-behaviour/math/010-divide.clean.sh
   trunk/tests/language-behaviour/math/011-divide-float.clean.sh
   trunk/tests/language-behaviour/math/013-mod.clean.sh
   trunk/tests/language-behaviour/math/014-subtract.clean.sh
   trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh
   trunk/tests/language-behaviour/math/015-lesseq.clean.sh
   trunk/tests/language-behaviour/math/016-greatereq.clean.sh
   trunk/tests/language-behaviour/math/017-greater.clean.sh
   trunk/tests/language-behaviour/math/018-less.clean.sh
   trunk/tests/language-behaviour/math/019-equals.clean.sh
   trunk/tests/language-behaviour/math/0191-not-equals.clean.sh
   trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh
   trunk/tests/language-behaviour/math/031-add-float.clean.sh
   trunk/tests/language-behaviour/strings/003-strcat.clean.sh
   trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh
   trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh
   trunk/tests/language-behaviour/strings/005-strcut.clean.sh
   trunk/tests/language-behaviour/strings/0051-regexp.clean.sh
   trunk/tests/language-behaviour/strings/0052-regexp.clean.sh
   trunk/tests/language-behaviour/strings/0053-toint.clean.sh
   trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh
   trunk/tests/language-behaviour/strings/103-quote.clean.sh
   trunk/tests/language-behaviour/strings/1031-quote.clean.sh
   trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh
   trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh
   trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh
   trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh
   trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh
   trunk/tests/language-behaviour/strings/143-newlines.clean.sh
   trunk/tests/language-behaviour/strings/145-url.clean.sh
   trunk/tests/language-behaviour/strings/161-star-dot.clean.sh
   trunk/tests/language-behaviour/variables/120-local-vars.clean.sh
   trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh
   trunk/tests/language-behaviour/variables/123-global-vars.clean.sh
   trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh
   trunk/tests/local/tc.template.data
Log:
New version of the swift shell script that uses new configuration mechanisms
Use wildcards in test suite tc.data, to fix issues with failing tests when apps like touch are in different locations on different systems
Adjust cleanup scripts in test suite for new swift command, so they don't try to remove non-existent logs and files


Deleted: trunk/bin/nswift
===================================================================
--- trunk/bin/nswift	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/bin/nswift	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,181 +0,0 @@
-#!/bin/bash
-
-# Referenced environment variables (default values):
-# SWIFT_ASSERTS
-# SWIFT_HEAP_MAX (1024M)
-# SWIFT_USAGE_STATS
-
-EXEC=org.griphyn.vdl.karajan.Loader
-OPTIONS="-XX:+HeapDumpOnOutOfMemoryError"
-
-CYGWIN=
-CPDELIM=":"
-HEAPMAX=1024M
-
-if echo `uname` | grep -i "cygwin"; then
-	CYGWIN="yes"
-    CPDELIM=";"
-fi
-
-updateOptions() {
-
-    if [ "X$1" != "X" ] ; then
-		OPTIONS="$OPTIONS -D$2=$1"
-    fi
-
-}
-
-####### MAIN BODY ##########
-
-if [ ! -d "$SWIFT_HOME" ] ; then
-    SWIFT_HOME=`dirname $0`"/.."
-    if [ ! -f "$SWIFT_HOME/lib/cog-swift-svn.jar" ] && [ ! -f "$SWIFT_HOME/lib/cog.jar" ] ; then
-		MY_PATH=`which $0`
-		SWIFT_HOME=`dirname $MY_PATH`"/.."
-		if [ ! -f "$SWIFT_HOME/lib/cog-swift-svn.jar" ] && [ ! -f "$SWIFT_HOME/lib/cog.jar" ] ; then
-	    	echo "Error: SWIFT_HOME is not set, and all attempts at guessing it failed"
-	    	exit 1
-		fi
-    fi
-fi
-
-OPTIONS="$OPTIONS -Djava.endorsed.dirs=$SWIFT_HOME/lib/endorsed"
-
-LOCALCLASSPATH=$SWIFT_HOME/etc$CPDELIM$SWIFT_HOME/libexec
-for JAR in $SWIFT_HOME/lib/*.jar; do
-	LOCALCLASSPATH="$LOCALCLASSPATH$CPDELIM$JAR"
-done
-LOCALCLASSPATH=$LOCALCLASSPATH$CPDELIM$CLASSPATH
-
-CMDLINE="$@"
-
-### SETUP OTHER ENV VARIABLES ####
-
-USERID=`id | awk '{printf("%s\n", substr($1, 5, index($1, "(")-5 ) ) }'`
-
-if [ "X$GLOBUS_HOSTNAME" = "X" ] && [ "X$HOSTNAME" != "X" ]; then
-	GLOBUS_HOSTNAME=$HOSTNAME
-fi
-
-updateOptions "$USERID" "UID"
-updateOptions "$GLOBUS_INSTALL_PATH" "GLOBUS_INSTALL_PATH"
-updateOptions "$GLOBUS_DEPLOY_PATH" "GLOBUS_DEPLOY_PATH"
-updateOptions "$GLOBUS_TCP_PORT_RANGE" "GLOBUS_TCP_PORT_RANGE"
-updateOptions "$GLOBUS_TCP_SOURCE_PORT_RANGE" "GLOBUS_TCP_SOURCE_PORT_RANGE"
-updateOptions "$GLOBUS_UDP_SOURCE_PORT_RANGE" "GLOBUS_UDP_SOURCE_PORT_RANGE"
-updateOptions "$GLOBUS_HOSTNAME" "GLOBUS_HOSTNAME"
-updateOptions "$X509_USER_CERT" "X509_USER_CERT"
-updateOptions "$X509_USER_KEY" "X509_USER_KEY"
-updateOptions "$X509_CERT_DIR" "X509_CERT_DIR"
-updateOptions "$X509_USER_PROXY" "X509_USER_PROXY"
-updateOptions "$SWIFT_HOME" "COG_INSTALL_PATH"
-updateOptions "$SWIFT_HOME" "swift.home"
-updateOptions "$SWIFT_USERHOME" "user.home"
-
-#Use /dev/urandom instead of /dev/random for seeding RNGs
-#This will lower the randomness of the seed, but avoid
-#large delays if /dev/random does not have enough entropy collected
-updateOptions "file:///dev/urandom" "java.security.egd"
-
-if [ "X$SWIFT_HEAP_MAX" != "X" ]; then
-	HEAPMAX=$SWIFT_HEAP_MAX
-fi
-if [ "X$HEAPMAX" != "X" ]; then
-	OPTIONS="-Xmx$HEAPMAX $OPTIONS"
-fi
-
-if [ "X$SWIFT_ASSERTS" != "X" ]; then
-	OPTIONS="-ea $OPTIONS"
-fi
-
-# Anonymous usage statistics
-LISTENER="128.135.125.18"
-PORT="9999"
-
-if [ -z "$SWIFT_USAGE_STATS" ]; then
-    SWIFT_USAGE_STATS=1
-fi
-
-# To disable usage statistics, uncomment the line below
-#SWIFT_USAGE_STATS=0
-
-PATH=$PATH:/sbin
-IFCONFIG=`which ifconfig 2>&1`
-if [ -x "$IFCONFIG" ]; then
-    MAC=`$IFCONFIG 2>/dev/null |grep HWaddr`
-fi
-
-# Check if we are running on a mac, if so look for md5 and not md5sum
-if [ "`uname`" = "Darwin" ]; then
-	MD5SUM=`which md5 2>&1`
-	if [ ! -x "$MD5SUM" ]; then
-		echo "warning: unable to find md5"
-		SWIFT_USAGE_STATS=0
-	fi
-else
-	MD5SUM=`which md5sum 2>&1`
-	if [ ! -x "$MD5SUM" ]; then
-		echo "warning: unable to find md5sum"
-		SWIFT_USAGE_STATS=0
-	fi
-fi
-
-BASH="/bin/bash"
-if [ ! -x "$BASH" ]; then
-    BASH=`which bash 2>&1`
-    if [ ! -x "$BASH" ]; then
-        echo "warning: unable to find bash"
-        SWIFT_USAGE_STATS=0
-    fi
-fi
-
-if [ "$SWIFT_USAGE_STATS" = 1 ]; then
-    for var in "$@"
-    do
-        SCRIPT=`echo $var|grep -i .swift`
-        if [ -e "$SCRIPT" ]; then
-            SCRIPT=$var
-            SCRIPTID=`$MD5SUM $SCRIPT|cut -d ' ' -f1`
-            SCRIPTLENGTH=`wc -l $SCRIPT|cut -d ' ' -f1`
-        fi
-    done
-    HOSTNAME=`hostname`
-    USERID=`echo $USERID $HOSTNAME $MAC | $MD5SUM |cut -d ' ' -f1`
-    DATE=`date`
-    KEY=`echo $USERID $DATE $$ | $MD5SUM | cut -d ' ' -f1`
-    $BASH -c "echo $KEY $USERID $SCRIPTID $SCRIPTLENGTH -1 0 > /dev/udp/$LISTENER/$PORT" > /dev/null 2>&1 &
-fi
-
-# Swiftrun
-if [[ "$CMDLINE" == *-listconfig* ]]
-then
-   swiftrun $CMDLINE
-   exit 0
-else
-   CMDLINE="$( swiftrun $CMDLINE )"
-fi
-
-### EXECUTE ############
-# Note: killing Swift may be briefly delayed due to Coasters shutdown
-if test -n "$CYGWIN"; then
-    set CLASSPATHSAVE=$CLASSPATH
-    export CLASSPATH="$LOCALCLASSPATH"
-    eval java ${OPTIONS} ${COG_OPTS} ${EXEC} ${CMDLINE}
-    export CLASSPATH=$CLASSPATHSAVE
-else
-    eval java ${OPTIONS} ${COG_OPTS} -classpath ${LOCALCLASSPATH} ${EXEC} ${CMDLINE}
-fi
-return_code=$?
-
-if [ "$SWIFT_USAGE_STATS" = 1 ]; then
-	$BASH -c "echo $KEY $USERID $SCRIPTID $SCRIPTLENGTH $return_code 1 > /dev/udp/$LISTENER/$PORT" > /dev/null 2>&1 &
-fi
-
-mv *.d/ $( ls -1rtd run*/ |tail -1 ) > /dev/null 2>&1
-rm *.swiftx *.kml > /dev/null 2>&1
-exit $return_code
-
-# Local Variables:
-# tab-width: 4
-# indent-tabs-mode: t
-# End:

Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/bin/swift	2013-11-18 18:25:32 UTC (rev 7294)
@@ -2,7 +2,7 @@
 
 # Referenced environment variables (default values):
 # SWIFT_ASSERTS
-# SWIFT_HEAP_MAX (256M)
+# SWIFT_HEAP_MAX (1024M)
 # SWIFT_USAGE_STATS
 
 EXEC=org.griphyn.vdl.karajan.Loader
@@ -17,18 +17,6 @@
     CPDELIM=";"
 fi
 
-fixCommandLine() {
-
-    COMMANDLINE=
-
-    while [ "X$1" !=  "X" ] ; do
-        COMMANDLINE="${COMMANDLINE} '$1'"
-        shift
-    done
-
-    echo $COMMANDLINE
-}
-
 updateOptions() {
 
     if [ "X$1" != "X" ] ; then
@@ -59,16 +47,8 @@
 done
 LOCALCLASSPATH=$LOCALCLASSPATH$CPDELIM$CLASSPATH
 
-CMDLINE=`fixCommandLine "$@"`
+CMDLINE="$@"
 
-# make sure sites.xml file is well-formed
-
-#$SWIFT_HOME/bin/chxml $CMDLINE
-#if [ "$?" != 0 ]; then
-#	echo "Could not process input files!"
-#	exit 1
-#fi
-
 ### SETUP OTHER ENV VARIABLES ####
 
 USERID=`id | awk '{printf("%s\n", substr($1, 5, index($1, "(")-5 ) ) }'`
@@ -166,6 +146,15 @@
     $BASH -c "echo $KEY $USERID $SCRIPTID $SCRIPTLENGTH -1 0 > /dev/udp/$LISTENER/$PORT" > /dev/null 2>&1 &
 fi
 
+# Swiftrun
+if [[ "$CMDLINE" == *-listconfig* ]]
+then
+   swiftrun $CMDLINE
+   exit 0
+else
+   CMDLINE="$( swiftrun $CMDLINE )"
+fi
+
 ### EXECUTE ############
 # Note: killing Swift may be briefly delayed due to Coasters shutdown
 if test -n "$CYGWIN"; then
@@ -182,6 +171,8 @@
 	$BASH -c "echo $KEY $USERID $SCRIPTID $SCRIPTLENGTH $return_code 1 > /dev/udp/$LISTENER/$PORT" > /dev/null 2>&1 &
 fi
 
+mv *.d/ $( ls -1rtd run*/ |tail -1 ) > /dev/null 2>&1
+rm *.swiftx *.kml > /dev/null 2>&1
 exit $return_code
 
 # Local Variables:

Modified: trunk/tests/documentation/tutorial/sequential_iteration.setup.sh
===================================================================
--- trunk/tests/documentation/tutorial/sequential_iteration.setup.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/documentation/tutorial/sequential_iteration.setup.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,3 +1,5 @@
 #!/bin/bash
-echo 'echo -n $(wc -c < $1) > $2' > /tmp/wcl
-chmod +x /tmp/wcl
+if [ ! -f "/tmp/wcl" ]; then
+   echo 'echo -n $(wc -c < $1) > $2' > /tmp/wcl
+   chmod +x /tmp/wcl
+fi

Deleted: trunk/tests/language-behaviour/IO/tc.template.mix.data
===================================================================
--- trunk/tests/language-behaviour/IO/tc.template.mix.data	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/IO/tc.template.mix.data	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1 +0,0 @@
-localhost	touch				/usr/bin/touch         INSTALLED	INTEL32::LINUX	null

Modified: trunk/tests/language-behaviour/arrays/020-array.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/020-array.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/020-array.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 020-array-* 020-array.swiftx 020-array.kml 020-array.out || exit 1
+rm -r 020-array.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 021-array-in-proc-param.out 021-array-in-proc-param-* 021-array-in-proc-param.kml 021-array-in-proc-param.swiftx || exit 1
+rm -r 021-array-in-proc-param.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 022-array-with-exprs-* 022-array-with-exprs.kml 022-array-with-exprs.swiftx 022-array-with-exprs.out || exit 1
+rm -r 022-array-with-exprs.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 025-array-passing-* 025-array-passing.kml 025-array-passing.swiftx 025-array-passing.out || exit 1
+rm -r 025-array-passing.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 027-array-assignment.out  027-array-assignment-* 027-array-assignment.kml 027-array-assignment.swiftx || exit 1
+rm -r 027-array-assignment.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 111-array-individual-assigns-* 111-array-individual-assigns.*ml 111-array-individual-assigns.out || exit 1
+rm -r 111-array-individual-assigns.out || exit 1
 exit 0 

Modified: trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 162-dot-on-array-* 162-dot-on-array.*ml 162-dot-on-array.out || exit 1
+rm -r 162-dot-on-array.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r array_multidimensional_index-* array_multidimensional_index.*ml array_multidimensional_index.out || exit 1
+rm -r array_multidimensional_index.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/arrays/q5.clean.sh
===================================================================
--- trunk/tests/language-behaviour/arrays/q5.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/arrays/q5.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r q5-* q5.*ml q5.out || exit 1
+rm -r q5.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0231-complex-type-* 0231-complex-type.*ml 0231-complex-type.out || exit 1
+rm -r 0231-complex-type.out || exit 1
 exit 0

Deleted: trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -r 027-single-character-typename-* 027-single-character-typename.*ml|| exit 1
-exit 0

Deleted: trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -r 028-double-character-typename-* 028-double-character-typename.*ml || exit 1
-exit 0

Modified: trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 032-boolconst-* 032-boolconst.*ml 032-boolconst.*.out || exit 1
+rm -r 032-boolconst.*.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 053-pass-int-* 053-pass-int.*ml 053-pass-int.out || exit 1
+rm -r 053-pass-int.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 054-pass-int-* 054-pass-int.*ml 054-pass-int.out || exit 1
+rm -r 054-pass-int.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 055-pass-int-* 055-pass-int.*ml 055-pass-int.out || exit 1
+rm -r 055-pass-int.out || exit 1
 exit 0

Deleted: trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh
===================================================================
--- trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -r regress-r2292-* regress-r2292.*ml || exit 1
-exit 0

Deleted: trunk/tests/language-behaviour/generate-tc.data
===================================================================
--- trunk/tests/language-behaviour/generate-tc.data	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/generate-tc.data	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-for cmd in wc touch sleep; do
-  echo "localhost	$cmd	$(which $cmd)	INSTALLED	INTEL32::LINUX	null" >> ./tc.data
-done
-
-for cmd in delayedcat; do
-  echo "localhost	$cmd	$(pwd)/${cmd}.sh	INSTALLED	INTEL32::LINUX	null" >> ./tc.data
-done
-

Modified: trunk/tests/language-behaviour/math/006-add.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/006-add.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/006-add.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 006-add-* 006-add.*ml 006-add.out || exit 1
+rm -r 006-add.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 007-add-in-proc-add-* 007-add-in-proc-add.*ml 007-add-in-proc-add.out || exit 1
+rm -r 007-add-in-proc-add.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/008-add-multiply.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/008-add-multiply.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/008-add-multiply.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 008-add-multiply-* 008-add-multiply.*ml 008-add-multiply.out || exit 1
+rm -r 008-add-multiply.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/009-multiply.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/009-multiply.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/009-multiply.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 009-multiply-* 009-multiply.*ml 009-multiply.out || exit 1
+rm -r 009-multiply.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/010-divide.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/010-divide.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/010-divide.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 010-divide-* 010-divide.*ml 010-divide.out || exit 1
+rm -r 010-divide.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/011-divide-float.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/011-divide-float.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/011-divide-float.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 011-divide-float-* 011-divide-float.*ml 011-divide-float.out || exit 1
+rm -r 011-divide-float.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/013-mod.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/013-mod.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/013-mod.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 013-mod-* 013-mod.*ml 013-mod.out || exit 1
+rm -r 013-mod.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/014-subtract.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/014-subtract.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/014-subtract.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 014-subtract-* 014-subtract.*ml 014-subtract.out || exit 1
+rm -r 014-subtract.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0145-unary-subtact-* 0145-unary-subtact.*ml 0145-unary-subtact.out || exit 1
+rm -r 0145-unary-subtact.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/015-lesseq.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/015-lesseq.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/015-lesseq.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 015-lesseq-* 015-lesseq.*ml 015-lesseq.out || exit 1
+rm -r 015-lesseq.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/016-greatereq.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/016-greatereq.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/016-greatereq.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 016-greatereq-* 016-greatereq.*ml 016-greatereq.out || exit 1
+rm -r 016-greatereq.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/017-greater.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/017-greater.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/017-greater.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 017-greater-* 017-greater.*ml 017-greater.out || exit 1
+rm -r 017-greater.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/018-less.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/018-less.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/018-less.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 018-less-* 018-less.*ml 018-less.out || exit 1
+rm -r 018-less.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/019-equals.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/019-equals.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/019-equals.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 019-equals-* 019-equals.*ml 019-equals.out || exit 1
+rm -r 019-equals.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/0191-not-equals.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/0191-not-equals.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/0191-not-equals.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0191-not-equals-* 0191-not-equals.*ml 0191-not-equals.out || exit 1
+rm -r 0191-not-equals.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 030-mix-float-int-* 030-mix-float-int.*ml 030-mix-float-int.out || exit 1
+rm -r 030-mix-float-int.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/math/031-add-float.clean.sh
===================================================================
--- trunk/tests/language-behaviour/math/031-add-float.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/math/031-add-float.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 031-add-float-* 031-add-float.*ml 031-add-float.out || exit 1
+rm -r 031-add-float.out || exit 1
 exit 0

Deleted: trunk/tests/language-behaviour/procedures/tc.template.mix.data
===================================================================
--- trunk/tests/language-behaviour/procedures/tc.template.mix.data	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/procedures/tc.template.mix.data	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,2 +0,0 @@
-
-localhost	sleep				/bin/sleep         INSTALLED	INTEL32::LINUX	null

Modified: trunk/tests/language-behaviour/strings/003-strcat.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/003-strcat.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/003-strcat.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 003-strcat-* 003-strcat.*ml 003-strcat.out || exit 1
+rm -r 003-strcat.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0031-strcat-op-* 0031-strcat-op.*ml 0031-strcat-op.out || exit 1
+rm -r 0031-strcat-op.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 004-strcat-in-arg-* 004-strcat-in-arg.*ml 004-strcat-in-arg.out || exit 1
+rm -r 004-strcat-in-arg.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/005-strcut.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/005-strcut.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/005-strcut.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 005-strcut-* 005-strcut.*ml 005-strcut.out || exit 1
+rm -r 005-strcut.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/0051-regexp.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/0051-regexp.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/0051-regexp.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0051-regexp-* 0051-regexp.*ml 0051-regexp.out || exit 1
+rm -r 0051-regexp.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/0052-regexp.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/0052-regexp.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/0052-regexp.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0052-regexp-* 0052-regexp.*ml 0052-regexp.out || exit 1
+rm -r 0052-regexp.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/0053-toint.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/0053-toint.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/0053-toint.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0053-toint-* 0053-toint.*ml 0053-toint.out || exit 1
+rm -r 0053-toint.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 0054-strsplit-* 0054-strsplit.*ml 0054-strsplit.out || exit 1
+rm -r 0054-strsplit.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/103-quote.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/103-quote.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/103-quote.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 103-quote-* 103-quote.*ml 103-quote.out || exit 1
+rm -r 103-quote.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/1031-quote.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/1031-quote.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/1031-quote.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 1031-quote-* 1031-quote.*ml 1031-quote.out || exit 1
+rm -r 1031-quote.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 1032-singlequote-* 1032-singlequote.*ml 1032-singlequote.out || exit 1
+rm -r 1032-singlequote.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 1033-singlequote-* 1033-singlequote.*ml 1033-singlequote.out || exit 1
+rm -r 1033-singlequote.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 141-space-in-filename-* 141-space-in-filename.*ml 141-space-in-filename*.out || exit 1
+rm -r 141-space-in-filename*.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 142-space-and-quotes-* 142-space-and-quotes.*ml 142-space-and-quotes*.out || exit 1
+rm -r 142-space-and-quotes*.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 1421-space-and-quotes-* 1421-space-and-quotes.*ml 1421-space-and-quotes*.out || exit 1
+rm -r 1421-space-and-quotes*.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/143-newlines.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/143-newlines.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/143-newlines.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 143-newlines-* 143-newlines.*ml 143-newlines.out || exit 1
+rm -r 143-newlines.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/145-url.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/145-url.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/145-url.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 145-url-* 145-url.*ml 145-url.out || exit 1
+rm -r 145-url.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/strings/161-star-dot.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/161-star-dot.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/161-star-dot.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 161-star-dot-* 161-star-dot.*ml 161-star-dot.out || exit 1
+rm -r 161-star-dot.out || exit 1
 exit 0

Deleted: trunk/tests/language-behaviour/strings/761-dirname.clean.sh
===================================================================
--- trunk/tests/language-behaviour/strings/761-dirname.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/strings/761-dirname.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -rv 761-dirname-* 761-dirname.*ml || exit 1
-exit 0

Deleted: trunk/tests/language-behaviour/tc.template.data
===================================================================
--- trunk/tests/language-behaviour/tc.template.data	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/tc.template.data	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,20 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# sitename  transformation  path   INSTALLED  platform  profiles
-localhost 	echo 		/bin/echo	INSTALLED	INTEL32::LINUX	null
-localhost 	cat 		/bin/cat	INSTALLED	INTEL32::LINUX	null
-localhost 	ls 		/bin/ls		INSTALLED	INTEL32::LINUX	null
-localhost 	grep 		/bin/grep	INSTALLED	INTEL32::LINUX	null
-localhost 	sort 		/bin/sort	INSTALLED	INTEL32::LINUX	null
-localhost 	paste 		/bin/paste	INSTALLED	INTEL32::LINUX	null
-localhost 	cp 		/bin/cp         INSTALLED	INTEL32::LINUX	null
-localhost 	sleep 		/bin/sleep      INSTALLED	INTEL32::LINUX	null
-localhost 	touch 		/bin/touch      INSTALLED	INTEL32::LINUX	null

Deleted: trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -r 084-declare-many-at-once-* 084-declare-many-at-once.*ml || exit 1
-exit 0

Modified: trunk/tests/language-behaviour/variables/120-local-vars.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/120-local-vars.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/120-local-vars.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 120-local-vars-* 120-local-vars.*ml 120-local-vars.out || exit 1
+rm -r 120-local-vars.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 121-multi-return-vars-* 121-multi-return-vars.*ml 121-multi-return-vars.*.out || exit 1
+rm -r 121-multi-return-vars.*.out || exit 1
 exit 0

Deleted: trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-rm -r 122-multi-return-vars-* 122-multi-return-vars.*ml|| exit 1
-exit 0

Modified: trunk/tests/language-behaviour/variables/123-global-vars.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/123-global-vars.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/123-global-vars.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 123-global-vars-* 123-global-vars.*ml 123-global-vars.out || exit 1
+rm -r 123-global-vars.out || exit 1
 exit 0

Modified: trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh
===================================================================
--- trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -x
-rm -r 1232-global-separate-assign-* 1232-global-separate-assign.*ml 1232-global-separate-assign.out || exit 1
+rm -r 1232-global-separate-assign.out || exit 1
 exit 0

Modified: trunk/tests/local/tc.template.data
===================================================================
--- trunk/tests/local/tc.template.data	2013-11-15 20:33:29 UTC (rev 7293)
+++ trunk/tests/local/tc.template.data	2013-11-18 18:25:32 UTC (rev 7294)
@@ -1,20 +1,2 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# sitename  transformation  path   INSTALLED  platform  profiles
-localhost 	echo	/bin/echo	INSTALLED	INTEL32::LINUX	null
-localhost 	cat	/bin/cat	INSTALLED	INTEL32::LINUX	null
-localhost 	ls	/bin/ls		INSTALLED	INTEL32::LINUX	null
-localhost 	grep	/bin/grep	INSTALLED	INTEL32::LINUX	null
-localhost 	sort	/bin/sort	INSTALLED	INTEL32::LINUX	null
-localhost 	paste	/bin/paste	INSTALLED	INTEL32::LINUX	nul
-localhost 	touch	/bin/touch      INSTALLED	INTEL32::LINUX	null
-
+* * * INSTALLED INTEL32::LINUX null
 localhost       append	_DIR_/append.sh INSTALLED	INTEL32::LINUX	null




More information about the Swift-commit mailing list