[Swift-commit] r5186 - in branches/release-0.93: bin docs/siteguide tests

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-09-28 13:06:07 -0500 (Wed, 28 Sep 2011)
New Revision: 5186

Modified:
   branches/release-0.93/bin/start-coaster-service
   branches/release-0.93/docs/siteguide/futuregrid
   branches/release-0.93/tests/suite.sh
Log:
Make suite.sh copy setup/clean/check scripts to new working directory
Better integration of start-coaster-service and gensites
Updated futuregrid docs


Modified: branches/release-0.93/bin/start-coaster-service
===================================================================
--- branches/release-0.93/bin/start-coaster-service	2011-09-27 21:27:12 UTC (rev 5185)
+++ branches/release-0.93/bin/start-coaster-service	2011-09-28 18:06:07 UTC (rev 5186)
@@ -242,7 +242,11 @@
 # Generate sites.xml
 export EXECUTION_URL="http://$IPADDR:$SERVICE_PORT"
 echo Generating sites.xml
-gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml 
+if [ -f "gensites.template" ]; then
+   gensites `cat gensites.template` -p $CONFIG_FILE > $RUN_DIR/sites.xml
+else
+   gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml 
+fi
 
 # Generate config file
 if [ "$SHARED_FILESYSTEM" == "no" ]; then
@@ -255,17 +259,3 @@
 EOF
 fi
 
-# Generate TC file
-echo Generating tc.data
-cat > $RUN_DIR/tc.data << EOF
-persistent-coasters 	echo		/bin/echo		null	null	null
-persistent-coasters 	cat		/bin/cat		null	null	null
-persistent-coasters 	ls		/bin/ls			null	null	null
-persistent-coasters 	grep		/bin/grep		null	null	null
-persistent-coasters 	sort		/bin/sort		null	null	null
-persistent-coasters 	paste		/bin/paste		null	null	null
-persistent-coasters 	cp		/bin/cp	        	null	null	null
-persistent-coasters	wc		/usr/bin/wc		null	null	null
-persistent-coasters	hostname	/bin/hostname		null	null	null
-EOF
-

Modified: branches/release-0.93/docs/siteguide/futuregrid
===================================================================
--- branches/release-0.93/docs/siteguide/futuregrid	2011-09-27 21:27:12 UTC (rev 5185)
+++ branches/release-0.93/docs/siteguide/futuregrid	2011-09-28 18:06:07 UTC (rev 5186)
@@ -5,7 +5,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The most recent versions of Swift can be found at 
 http://www.ci.uchicago.edu/swift/downloads/index.php. To run on futuregrid,
-you will need to download the development/trunk version from SVN.
+you will need to use Swift 0.93 or later.
 
 Adding Swift to your PATH
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,13 +35,14 @@
 following command:
 
 -----
-$ svn co https://svn.ci.uchicago.edu/svn/vdl2/usertools/swift-vm-boot
+$ svn co https://svn.ci.uchicago.edu/svn/vdl2/usertools/swift-vm-boot swift-vm-boot
 -----
 
 Download your Credentials
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 Run the following commands to retrieve your credentials:
 -----
+$ cd swift-vm-boot
 $ scp yourusername at hotel.futuregrid.org:nimbus_creds.tar.gz .
 $ tar xvfz nimbus_creds.tar.gz
 -----

Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh	2011-09-27 21:27:12 UTC (rev 5185)
+++ branches/release-0.93/tests/suite.sh	2011-09-28 18:06:07 UTC (rev 5186)
@@ -782,7 +782,8 @@
 
   OUTPUT=$NAME.setup.stdout
   if [ -x $GROUP/$SETUPSCRIPT ]; then
-    script_exec $GROUP/$SETUPSCRIPT "S"
+    cp -v $GROUP/$SETUPSCRIPT .
+    script_exec ./$SETUPSCRIPT "S"
   else
     stage_files $GROUP $NAME
   fi
@@ -798,6 +799,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=$(( ! $?  ))
@@ -814,15 +818,17 @@
   TEST_SHOULD_FAIL=0
   OUTPUT=$NAME.check.stdout
   if [ -x $GROUP/$CHECKSCRIPT ]; then
-  	export TEST_LOG=$NAME.stdout
-    script_exec $GROUP/$CHECKSCRIPT "√"
+    cp "$GROUP/$CHECKSCRIPT" .	
+    export TEST_LOG=$NAME.stdout
+    script_exec ./$CHECKSCRIPT "√"
   else
     check_outputs $GROUP $NAME
   fi
 
   OUTPUT=$NAME.clean.stdout
   if [ -x $GROUP/$CLEANSCRIPT ]; then
-    script_exec $GROUP/$CLEANSCRIPT "C"
+    cp "$GROUP/$CLEANSCRIPT" .
+    script_exec ./$CLEANSCRIPT "C"
   else
    html_td width 25
    html "  "