[Swift-commit] r5188 - in trunk/tests: . language-behaviour/mappers

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-09-28 14:29:39 -0500 (Wed, 28 Sep 2011)
New Revision: 5188

Added:
   trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.setup.sh
Modified:
   trunk/tests/suite.sh
Log:
Suite.sh fix to copy setup scripts to script directory


Added: trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.setup.sh
===================================================================
--- trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.setup.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.setup.sh	2011-09-28 19:29:39 UTC (rev 5188)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+cp -v $GROUP/07555-ext-mapper-twostruct.sh.in . || exit 1
+
+exit 0


Property changes on: trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.setup.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-09-28 18:32:43 UTC (rev 5187)
+++ trunk/tests/suite.sh	2011-09-28 19:29:39 UTC (rev 5188)
@@ -53,7 +53,7 @@
     -f)
       TEXTREPORT=1
       shift;;
-    -h)
+    -h|--h|-help|--help)
       printhelp
       exit 0;;
     -k)
@@ -799,8 +799,9 @@
 
   TEST_SHOULD_FAIL=0
   OUTPUT=$NAME.setup.stdout
-  if [ -x $GROUP/$SETUPSCRIPT ]; then
-    script_exec $GROUP/$SETUPSCRIPT "S"
+  if [ -x "$GROUP/$SETUPSCRIPT" ]; then
+    cp "$GROUP/$SETUPSCRIPT" .
+    script_exec ./$SETUPSCRIPT "S"
   else
     stage_files $GROUP $NAME
   fi
@@ -816,7 +817,9 @@
   (( TESTCOUNT++ ))
 
   TIMEOUT=$( gettimeout $GROUP/$TIMEOUTFILE )
-
+  if [ -f "$GROUP/$TIMEOUTFILE" ]; then
+     cp "$GROUP/$TIMEOUTFILE" .
+  fi
   grep THIS-SCRIPT-SHOULD-FAIL $GROUP/$SWIFTSCRIPT > /dev/null
   TEST_SHOULD_FAIL=$(( ! $?  ))
 
@@ -830,16 +833,18 @@
                        $CDM $SWIFTSCRIPT $ARGS
 
   TEST_SHOULD_FAIL=0
-  if [ -x $GROUP/$CHECKSCRIPT ]; then
+  if [ -x "$GROUP/$CHECKSCRIPT" ]; then
+     cp "$GROUP/$CHECKSCRIPT" .
      OUTPUT=$NAME.check.stdout  
-    script_exec $GROUP/$CHECKSCRIPT "√"
+     script_exec ./$CHECKSCRIPT "√"
   else
     check_outputs $GROUP $NAME
   fi
 
    OUTPUT=$NAME.clean.stdout
-  if [ -x $GROUP/$CLEANSCRIPT ]; then
-    script_exec $GROUP/$CLEANSCRIPT "C"
+  if [ -x "$GROUP/$CLEANSCRIPT" ]; then
+    cp "$GROUP/$CLEANSCRIPT" .
+    script_exec ./$CLEANSCRIPT "C"
   else
    html_td width 25
    html "  "
@@ -860,8 +865,9 @@
 
   TEST_SHOULD_FAIL=0
   OUTPUT=$NAME.clean.stdout
-  if [ -x $GROUP/$SETUPSCRIPT ]; then
-    script_exec $GROUP/$SETUPSCRIPT "S"
+  if [ -x "$GROUP/$SETUPSCRIPT" ]; then
+    cp "$GROUP/$SETUPSCRIPT" .
+    script_exec ./$SETUPSCRIPT "S"
   else
    html_td width 25
    html "  "
@@ -892,8 +898,9 @@
   fi
 
   OUTPUT=$NAME.check.stdout
-  if [ -x $GROUP/$CHECKSCRIPT ]; then
-    script_exec $GROUP/$CHECKSCRIPT "√"
+  if [ -x "$GROUP/$CHECKSCRIPT" ]; then
+    cp "$GROUP/$CHECKSCRIPT" .
+    script_exec ./$CHECKSCRIPT "√"
   else
    html_td width 25
    html "  "
@@ -901,8 +908,9 @@
   fi
 
   OUTPUT=$NAME.clean.stdout
-  if [ -x $GROUP/$CLEANSCRIPT ]; then
-    script_exec $GROUP/$CLEANSCRIPT "C"
+  if [ -x "$GROUP/$CLEANSCRIPT" ]; then
+    cp "$GROUP/$CLEANSCRIPT" .
+    script_exec ./$CLEANSCRIPT "C"
   else
    html_td width 25
    html "  "