[Swift-commit] r5169 - branches/release-0.93/tests

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-09-24 22:58:06 -0500 (Sat, 24 Sep 2011)
New Revision: 5169

Modified:
   branches/release-0.93/tests/suite.sh
Log:
Better integration with gensites


Modified: branches/release-0.93/tests/suite.sh
===================================================================
--- branches/release-0.93/tests/suite.sh	2011-09-25 01:53:14 UTC (rev 5168)
+++ branches/release-0.93/tests/suite.sh	2011-09-25 03:58:06 UTC (rev 5169)
@@ -155,15 +155,9 @@
 TESTDIR=$TOPDIR/cog/modules/swift/tests
 
 # Ensure all given variables are set
+# Deprecated - this is now handled by gensites
 checkvars() {
-  while (( ${#*} ))
-   do
-   VAR=$1
-   V=$( eval "echo \${${VAR}+1}" )
-   [[ $V == 1 ]] || crash "Not set: $VAR"
-   shift
-  done
-  return 0
+   return
 }
 
 checkfail() {
@@ -962,7 +956,13 @@
   else
      TEMPLATE="$TESTDIR/sites/localhost.xml"
   fi
-   
+  
+  # Give default to _WORK_ if undefined in swift.properties
+  if [ -z "$WORK" ]
+  then
+     export WORK=$TOPDIR/work
+  fi
+
   # Call gensites
   TEMPLATE_DIRNAME=`dirname $TEMPLATE`
   TEMPLATE=`basename $TEMPLATE`
@@ -1133,12 +1133,8 @@
 }
 
 
-if [[ $WORK == "" ]]
-then
-  WORK=$TOPDIR/work
-fi
 
-checkvars GROUPARG
+#checkvars GROUPARG
 echo "GROUP ARGUMENT: $GROUPARG"
 if [[ $GROUPARG != /* ]]; then
   # Adjust relative path