[Swift-commit] r4500 - trunk/tests

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-05-19 12:59:55 -0500 (Thu, 19 May 2011)
New Revision: 4500

Modified:
   trunk/tests/suite.sh
Log:
Output improvement


Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-05-19 17:39:17 UTC (rev 4499)
+++ trunk/tests/suite.sh	2011-05-19 17:59:55 UTC (rev 4500)
@@ -618,8 +618,16 @@
 
 # Execute process in the background
 process_exec() {
-  printf "\nExecuting: $@ \n\n" | tee -a $LOG
+  PROG=$( basename $1 )
+  if [[ $PROG == "swift" ]]; then
+    # Get SwiftScript name
+    PROG=$( echo $@ | sed 's/.*\( [^ ]*.swift\)/\1/' )
+    PROG=$( basename $PROG )
+  fi
 
+  echo -e "\nExecuting: $PROG"
+  echo -e "\nExecuting: $@\n" >> $LOG
+
   rm -f $OUTPUT
 
   "$@" > $OUTPUT 2>&1 &
@@ -748,7 +756,7 @@
   verbose "killing monitor: $MONITOR_PID..."
   kill $MONITOR_PID
 
-  echo "TOOK: $(( STOP-START ))"
+  echo "TOOK (seconds): $(( STOP-START ))"
 
   RESULT=$( result )
   test_log