[Swift-commit] r6595 - branches/release-0.94/tests

[yadunandb at ci.uchicago.edu]

Author: yadunandb
Date: 2013-07-02 15:59:01 -0500 (Tue, 02 Jul 2013)
New Revision: 6595

Modified:
   branches/release-0.94/tests/suite.sh
Log:

Updating suite.sh

- Removed the old mechanism with #overrides for GLOBUS_HOSTNAME
- Added support for .source.sh files which will affect the 
namespace of the suite.sh script.
 


Modified: branches/release-0.94/tests/suite.sh
===================================================================
--- branches/release-0.94/tests/suite.sh	2013-07-02 18:39:25 UTC (rev 6594)
+++ branches/release-0.94/tests/suite.sh	2013-07-02 20:59:01 UTC (rev 6595)
@@ -403,20 +403,6 @@
 	fi
 }
 
-override_globals() {
-  FILE=$1;
-  index=0;
-  while read line
-  do
-    if echo $line | grep -q "#OVERRIDE_" ; then
-      line=($line)
-      var_lhs=${line[0]#\#OVERRIDE_}
-      var_rhs=${line[1]};
-      eval export $var_lhs=$var_rhs;
-    fi
-  done < $FILE
-}
-
 start_group() {
   G=$1
   echo
@@ -796,6 +782,7 @@
     return 0
   fi
 
+  SOURCESCRIPT=$NAME.source.sh
   SETUPSCRIPT=$NAME.setup.sh
   CHECKSCRIPT=$NAME.check.sh
   CLEANSCRIPT=$NAME.clean.sh
@@ -805,18 +792,15 @@
   TEST_SHOULD_FAIL=0
   OUTPUT=$NAME.setup.stdout
 
+  if [ -x "$GROUP/$SOURCESCRIPT" ]; then
+    cp "$GROUP/$SOURCESCRIPT" .
+    source ./$SOURCESCRIPT 
+  fi
+  echo "GLOBUS_HOSTNAME : $GLOBUS_HOSTNAME"
+
   if [ -x "$GROUP/$SETUPSCRIPT" ]; then
     cp "$GROUP/$SETUPSCRIPT" .
     script_exec ./$SETUPSCRIPT "S"
-    globus_var=`grep "#OVERRIDE_" ./$SETUPSCRIPT`;
-    echo "Globus_var  = $globus_var"
-    if [ $? == 0 ]
-    then
-      globus_var=($globus_var);
-      lhs_var=${globus_var[0]##OVERRIDE_} # Add check here to confirm if GLOBUS_HOSTNAME
-      rhs_val=${globus_var[1]}
-      export GLOBUS_HOSTNAME=$rhs_val
-    fi
   else
     stage_files $GROUP $NAME
   fi