[Swift-commit] r5473 - in branches/release-0.93: etc/sites examples/misc tests tests/sites/local

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-12-24 18:21:16 -0600 (Sat, 24 Dec 2011)
New Revision: 5473

Added:
   branches/release-0.93/examples/misc/data.txt
   branches/release-0.93/tests/providers
Removed:
   branches/release-0.93/etc/sites/OLD/
Modified:
   branches/release-0.93/etc/sites/intrepid
   branches/release-0.93/tests/sites/local/sites.template.xml
   branches/release-0.93/tests/sites/local/tc.template.data
   branches/release-0.93/tests/suite.sh
Log:
Various fixes for test suite


Modified: branches/release-0.93/etc/sites/intrepid
===================================================================
--- branches/release-0.93/etc/sites/intrepid	2011-12-24 17:12:38 UTC (rev 5472)
+++ branches/release-0.93/etc/sites/intrepid	2011-12-25 00:21:16 UTC (rev 5473)
@@ -1,3 +1,5 @@
+<!-- Template for Intrepid. More information about this system can be found -->
+<!-- at http://www.alcf.anl.gov/support/gettingstarted/index.php -->
 <config>
 
   <pool handle="localhost" sysinfo="INTEL32::LINUX">
@@ -4,7 +6,6 @@
     <gridftp url="local://localhost" />
     <execution provider="local" url="none" />
     <workdirectory>_WORK_</workdirectory>
-    <!-- <profile namespace="karajan" key="maxSubmitRate">1</profile> -->
     <profile namespace="karajan" key="jobThrottle">0.04</profile>
     <profile namespace="swift"   key="stagingMethod">file</profile>
   </pool>
@@ -12,7 +13,6 @@
   <pool handle="coasters_alcfbgp">
     <filesystem provider="local" />
     <execution provider="coaster" jobmanager="local:cobalt"/>
-    <!-- <profile namespace="swift"   key="stagingMethod">local</profile> -->
     <profile namespace="globus"  key="internalHostname">_HOST_</profile>
     <profile namespace="globus"  key="project">_PROJECT_</profile>
     <profile namespace="globus"  key="queue">_QUEUE_</profile>
@@ -23,7 +23,7 @@
     <profile namespace="globus"  key="jobsPerNode">1</profile>
     <profile namespace="globus"  key="workerLoggingLevel">DEBUG</profile>
     <profile namespace="globus"  key="slots">1</profile>
-    <profile namespace="globus"  key="maxTime">900</profile> <!-- seconds -->
+    <profile namespace="globus"  key="maxTime">900</profile> 
     <profile namespace="globus"  key="nodeGranularity">64</profile>
     <profile namespace="globus"  key="maxNodes">64</profile>
     <workdirectory>_WORK_</workdirectory>

Added: branches/release-0.93/examples/misc/data.txt
===================================================================
--- branches/release-0.93/examples/misc/data.txt	                        (rev 0)
+++ branches/release-0.93/examples/misc/data.txt	2011-12-25 00:21:16 UTC (rev 5473)
@@ -0,0 +1 @@
+hello

Added: branches/release-0.93/tests/providers
===================================================================
--- branches/release-0.93/tests/providers	                        (rev 0)
+++ branches/release-0.93/tests/providers	2011-12-25 00:21:16 UTC (rev 5473)
@@ -0,0 +1 @@
+link sites
\ No newline at end of file


Property changes on: branches/release-0.93/tests/providers
___________________________________________________________________
Added: svn:special
   + *

Modified: branches/release-0.93/tests/sites/local/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/local/sites.template.xml	2011-12-24 17:12:38 UTC (rev 5472)
+++ branches/release-0.93/tests/sites/local/sites.template.xml	2011-12-25 00:21:16 UTC (rev 5473)
@@ -1,5 +1,5 @@
 <config>
-<pool handle="local">
+<pool handle="localhost">
   <execution provider="local" />
   <gridftp url="local://localhost" />
   <profile key="initialScore" namespace="karajan">10000</profile>

Modified: branches/release-0.93/tests/sites/local/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/local/tc.template.data	2011-12-24 17:12:38 UTC (rev 5472)
+++ branches/release-0.93/tests/sites/local/tc.template.data	2011-12-25 00:21:16 UTC (rev 5473)
@@ -1,8 +1,8 @@
-local 	echo 		/bin/echo	INSTALLED	INTEL32::LINUX
-local 	cat 		/bin/cat	INSTALLED	INTEL32::LINUX
-local 	ls 		/bin/ls		INSTALLED	INTEL32::LINUX
-local 	grep 		/bin/grep	INSTALLED	INTEL32::LINUX
-local 	sort 		/bin/sort	INSTALLED	INTEL32::LINUX
-local 	paste 		/bin/paste	INSTALLED	INTEL32::LINUX
-local	wc		/usr/bin/wc	INSTALLED	INTEL32::LINUX
+localhost 	echo 		/bin/echo	INSTALLED	INTEL32::LINUX
+localhost 	cat 		/bin/cat	INSTALLED	INTEL32::LINUX
+localhost 	ls 		/bin/ls		INSTALLED	INTEL32::LINUX
+localhost 	grep 		/bin/grep	INSTALLED	INTEL32::LINUX
+localhost 	sort 		/bin/sort	INSTALLED	INTEL32::LINUX
+localhost 	paste 		/bin/paste	INSTALLED	INTEL32::LINUX
+localhost	wc		/usr/bin/wc	INSTALLED	INTEL32::LINUX
 

Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh	2011-12-24 17:12:38 UTC (rev 5472)
+++ branches/release-0.93/tests/suite.sh	2011-12-25 00:21:16 UTC (rev 5473)
@@ -962,7 +962,7 @@
   elif [ -f "$GROUP/gensites.template" ]; then
      TEMPLATE=`$GROUP/gensites.template`
   else
-     TEMPLATE="$TESTDIR/sites/localhost.xml"
+     TEMPLATE="$TESTDIR/sites/local/sites.template.xml"
   fi
 
   # Give default to _WORK_ if undefined in swift.properties