[Swift-commit] r4499 - trunk/tests

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-05-19 12:39:17 -0500 (Thu, 19 May 2011)
New Revision: 4499

Modified:
   trunk/tests/suite.sh
Log:
Output cleanup, keep sitedir


Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-05-19 16:40:47 UTC (rev 4498)
+++ trunk/tests/suite.sh	2011-05-19 17:39:17 UTC (rev 4499)
@@ -618,13 +618,12 @@
 
 # Execute process in the background
 process_exec() {
-  printf "\nExecuting: $@\n" | tee -a $LOG
+  printf "\nExecuting: $@ \n\n" | tee -a $LOG
 
   rm -f $OUTPUT
 
   "$@" > $OUTPUT 2>&1 &
   PROCESS_INTERNAL_PID=$!
-  echo PROCESS_INTERNAL_PID=$PROCESS_INTERNAL_PID
   trap "process_trap $PROCESS_INTERNAL_PID" SIGTERM
   wait
   EXITCODE=$?
@@ -632,8 +631,10 @@
   if [ "$EXITCODE" == "127" ]; then
     echo "Command not found: $@" > $OUTPUT
   fi
+  if [ $EXITCODE != 0 ]; then
+    cat $OUTPUT
+  fi
   if [ -f $OUTPUT ]; then
-    cat $OUTPUT
     cat $OUTPUT >> $LOG
   fi
   (( $TEST_SHOULD_FAIL )) && EXITCODE=$(( ! $EXITCODE ))
@@ -646,7 +647,7 @@
   banner "$TEST (part $SEQ)"
   echo "Executing $TEST (part $SEQ)"
   pwd
-  printf "\nExecuting: $@" >>$LOG
+  printf "\nExecuting: $@\n" >>$LOG
 
   rm -f $OUTPUT
   "$@" > $OUTPUT 2>&1
@@ -798,6 +799,7 @@
 
   monitored_exec $TIMEOUT swift                         \
                        -wrapperlog.always.transfer true \
+                       -sitedir.keep true               \
                        -config swift.properties         \
                        -sites.file sites.xml            \
                        -tc.file tc.data                 \