[test-suite] r263414 - [cmake] Add support for --redirect-stdout and --chdir to timeit.sh

[James Molloy via llvm-commits]

Author: jamesm
Date: Mon Mar 14 04:42:16 2016
New Revision: 263414

URL: http://llvm.org/viewvc/llvm-project?rev=263414&view=rev
Log:
[cmake] Add support for --redirect-stdout and --chdir to timeit.sh

These options were added to timeit.c by Matthias and are required for running SPEC with --use-perf.

Modified:
    test-suite/trunk/tools/timeit.sh

Modified: test-suite/trunk/tools/timeit.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/tools/timeit.sh?rev=263414&r1=263413&r2=263414&view=diff
==============================================================================
--- test-suite/trunk/tools/timeit.sh (original)
+++ test-suite/trunk/tools/timeit.sh Mon Mar 14 04:42:16 2016
@@ -4,6 +4,7 @@
 REPORT=/dev/stderr
 INPUT=/dev/stdin
 OUTPUT=/dev/stdout
+ERRPUT=/dev/stderr
 PERFSTAT=perfstats
 
 while [[ $1 = -* ]]; do
@@ -13,12 +14,22 @@ while [[ $1 = -* ]]; do
 	elif [ $1 = "--redirect-input" ]; then
 		INPUT=$2
 	elif [ $1 = "--redirect-output" ]; then
-		OUTPUT=$2
+     	    OUTPUT=$2
+	    ERRPUT=$2
+	elif [ $1 = "--redirect-stdout" ]; then
+            OUTPUT=$2
+	elif [ $1 = "--chdir" ]; then
+            cd $2
 	fi
 	shift 2
 done
 
-perf stat -o $PERFSTAT $@ < $INPUT &> $OUTPUT
+if [ "$OUTPUT" = "$ERRPUT" ]; then
+    # Use >& to ensure the streams are properly interleaved.
+    perf stat -o $PERFSTAT $@ < $INPUT >& $OUTPUT
+else
+    perf stat -o $PERFSTAT $@ < $INPUT > $OUTPUT 2> $ERRPUT
+fi
 
 EXITCODE=$?