[Swift-commit] r6667 - in branches/release-0.94/tests: . groups sites stress/remote_sanity

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-07-25 15:01:31 -0500 (Thu, 25 Jul 2013)
New Revision: 6667

Added:
   branches/release-0.94/tests/groups/group-sites.sh
   branches/release-0.94/tests/sites/beagle/
   branches/release-0.94/tests/sites/mac-frisbee/
   branches/release-0.94/tests/sites/mcs/
   branches/release-0.94/tests/sites/midway/
   branches/release-0.94/tests/sites/uc3/
Removed:
   branches/release-0.94/tests/groups/group-remote-sanity.sh
   branches/release-0.94/tests/stress/remote_sanity/beagle/
   branches/release-0.94/tests/stress/remote_sanity/mac-frisbee/
   branches/release-0.94/tests/stress/remote_sanity/mcs/
   branches/release-0.94/tests/stress/remote_sanity/midway/
   branches/release-0.94/tests/stress/remote_sanity/uc3/
Modified:
   branches/release-0.94/tests/README
   branches/release-0.94/tests/groups/group-daily-remote.sh
   branches/release-0.94/tests/user_env.sh
Log:
Adding new site tests from stress/ to sites/


Modified: branches/release-0.94/tests/README
===================================================================
--- branches/release-0.94/tests/README	2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/README	2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,7 +1,7 @@
 USAGENOTES contains instructions on how to operate the test suite.
 It is an asciidoc document, in order to properly build it run the following command:
-$ asciidoc -a toc USAGENOTES
-It will generate an HTML file called USAGENOTES. 
+$ asciidoc -a toc USAGENOTES.txt
+It will generate an HTML file called USAGENOTES.html.
 
 Warning:
 asciidoc must be installed.

Modified: branches/release-0.94/tests/groups/group-daily-remote.sh
===================================================================
--- branches/release-0.94/tests/groups/group-daily-remote.sh	2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/groups/group-daily-remote.sh	2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,13 +1,13 @@
 
 # GROUPLIST definition to run all local tests
 
-GROUPLIST=( # Remote sanity test-group
-            $TESTDIR/stress/remote_sanity/beagle \
-            $TESTDIR/stress/remote_sanity/mcs    \
-            $TESTDIR/stress/remote_sanity/midway \
-            $TESTDIR/stress/remote_sanity/uc3    \
+GROUPLIST=( # Site testing test-group
+            $TESTDIR/sites/beagle \
+            $TESTDIR/sites/mcs    \
+            $TESTDIR/sites/midway \
+            $TESTDIR/sites/uc3    \
 	    # Frisbee will fail due to Bug 1030  
-            #TESTDIR/stress/remote_sanity/mac-frisbee  \
+            #TESTDIR/sites/mac-frisbee  \
 	    
 	    # Remote-cluster IO tests
 	    $TESTDIR/stress/IO/beagle \

Deleted: branches/release-0.94/tests/groups/group-remote-sanity.sh
===================================================================
--- branches/release-0.94/tests/groups/group-remote-sanity.sh	2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/groups/group-remote-sanity.sh	2013-07-25 20:01:31 UTC (rev 6667)
@@ -1,12 +0,0 @@
-
-# GROUPLIST definition to run all local tests
-
-GROUPLIST=( 
-            $TESTDIR/stress/remote_sanity/beagle \
-            $TESTDIR/stress/remote_sanity/mcs    \
-            $TESTDIR/stress/remote_sanity/midway \
-	    $TESTDIR/stress/remote_sanity/uc3    \
-            $TESTDIR/stress/remote_sanity/mac-frisbee  \
-          )
-
-checkvars WORK

Copied: branches/release-0.94/tests/groups/group-sites.sh (from rev 6664, branches/release-0.94/tests/groups/group-remote-sanity.sh)
===================================================================
--- branches/release-0.94/tests/groups/group-sites.sh	                        (rev 0)
+++ branches/release-0.94/tests/groups/group-sites.sh	2013-07-25 20:01:31 UTC (rev 6667)
@@ -0,0 +1,12 @@
+
+# GROUPLIST definition to run all local tests
+
+GROUPLIST=( 
+            $TESTDIR/sites/beagle \
+            $TESTDIR/sites/mcs    \
+            $TESTDIR/sites/midway \
+	    $TESTDIR/sites/uc3    \
+            $TESTDIR/sites/mac-frisbee  \
+          )
+
+checkvars WORK

Modified: branches/release-0.94/tests/user_env.sh
===================================================================
--- branches/release-0.94/tests/user_env.sh	2013-07-25 19:28:59 UTC (rev 6666)
+++ branches/release-0.94/tests/user_env.sh	2013-07-25 20:01:31 UTC (rev 6667)
@@ -3,8 +3,8 @@
 export MCS_USERNAME=""
 export UC3_USERNAME=""
 
-if [ "midway001" == "midway001" ]
+if [ $( hostname ) == "midway001" ]
 then
    export GLOBUS_HOSTNAME=swift.rcc.uchicago.edu
    export GLOBUS_TCP_PORT_RANGE=50000,51000
-fi;
\ No newline at end of file
+fi;