[Swift-commit] r3615 - in trunk/tests: . local

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-09-08 13:59:31 -0500 (Wed, 08 Sep 2010)
New Revision: 3615

Modified:
   trunk/tests/local/range.check.sh
   trunk/tests/nightly.sh
Log:
Minor improvements


Modified: trunk/tests/local/range.check.sh
===================================================================
--- trunk/tests/local/range.check.sh	2010-09-08 18:57:54 UTC (rev 3614)
+++ trunk/tests/local/range.check.sh	2010-09-08 18:59:31 UTC (rev 3615)
@@ -4,7 +4,7 @@
 
 ls stdout.txt || exit 1
 
-COUNT=$( grep -c "trace:" stdout.txt )
+COUNT=$( grep -c "num:" stdout.txt )
 (( $COUNT == 11 )) || exit 1
 
 exit 0

Modified: trunk/tests/nightly.sh
===================================================================
--- trunk/tests/nightly.sh	2010-09-08 18:57:54 UTC (rev 3614)
+++ trunk/tests/nightly.sh	2010-09-08 18:59:31 UTC (rev 3615)
@@ -129,6 +129,16 @@
 mkdir -p $RUNDIR
 [ $? != 0 ] && echo "Could not mkdir: $RUNDIR" && exit 1
 
+checkfail() {
+  ERR=$?
+  shift
+  MSG=${*}
+  if [[ $ERR != 0 ]]; then
+    echo "FAILED($ERR): $MSG"
+    exit $ERR
+  fi
+}
+
 crash() {
   MSG=$1
   echo $MSG
@@ -288,6 +298,13 @@
   html_~html
 }
 
+printlist() {
+  while [[ $1 != "" ]]; do
+    echo $1
+    shift
+  done
+}
+
 outecho() {
   TYPE=$1
   shift
@@ -427,7 +444,6 @@
 }
 
 process_exec() {
-  declare -p PWD
   printf "\nExecuting: $@" >>$LOG
   rm -fv $OUTPUT
   "$@" > $OUTPUT 2>&1
@@ -585,9 +601,6 @@
   # ptest
 }
 
-#ptest() {
-#}
-
 build_package() {
   TEST="Package"
   test_exec cd $SWIFT_HOME/lib
@@ -631,10 +644,10 @@
 
 group_swift_properties() {
   if [ -f $GROUP/swift.properties ]; then
-    cp -uv $GROUP/swift.properties .
+    cp -v $GROUP/swift.properties .
     [ $? != 0 ] && crash "Could not copy swift.properties!"
   else
-    cp -uv $SWIFT_HOME/etc/swift.properties .
+    cp -v $SWIFT_HOME/etc/swift.properties .
     [ $? != 0 ] && crash "Could not copy swift.properties!"
   fi
 }
@@ -654,12 +667,15 @@
   group_fs_data
   group_swift_properties
 
-  for TEST in $( ls $GROUP/*.swift ); do
+  SWIFTS=$( ls $GROUP/*.swift )
+  checkfail "Could not ls: $GROUP"
 
+  for TEST in $SWIFTS; do
+
     (( SKIP_COUNTER++ < SKIP_TESTS )) && continue
 
     TESTNAME=$( basename $TEST)
-    cp -uv $GROUP/$TESTNAME .
+    cp -v $GROUP/$TESTNAME .
     TESTLINK=$TESTNAME
 
     start_row
@@ -670,7 +686,6 @@
   done
 }
 
-
 date > $LOG
 
 header
@@ -734,8 +749,6 @@
             $TESTDIR/cdm \
             $TESTDIR/cdm-ps )
 
-echo ${GROUPLIST[@]}
-
 GROUPCOUNT=1
 for G in ${GROUPLIST[@]}; do
   GROUP=$G
@@ -769,6 +782,8 @@
 
 footer
 
+exit 0
+
 # Local Variables:
 # sh-basic-offset: 2
 # End: