pts: More test profile updates....

12 files changed, 37 insertions, 36 deletions

diff --git a/pts/test-resources/compliance-ogl/install.sh b/pts/test-resources/compliance-ogl/install.sh
index e590a6d..83a5994 100755
--- a/pts/test-resources/compliance-ogl/install.sh
+++ b/pts/test-resources/compliance-ogl/install.sh
@@ -7,7 +7,7 @@ cd ..
 
 cat > compliance-ogl << 'EOT'
 #!/bin/sh
-LD_LIBRARY_PATH=glew/lib:$LD_LIBRARY_PATH ./glew/bin/glewinfo > \$LOG_FILE
-cat \$LOG_FILE | grep GL_VERSION
+LD_LIBRARY_PATH=glew/lib:$LD_LIBRARY_PATH ./glew/bin/glewinfo > $LOG_FILE
+cat $LOG_FILE | grep GL_VERSION
 EOT
 chmod +x compliance-ogl
diff --git a/pts/test-resources/compliance-ogl/parse-results.php b/pts/test-resources/compliance-ogl/parse-results.php
index 09b9645..708710e 100644
--- a/pts/test-resources/compliance-ogl/parse-results.php
+++ b/pts/test-resources/compliance-ogl/parse-results.php
@@ -27,14 +27,15 @@ function extension_present($source, $item)
 }
 
 $ogl_results = array();
-
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_1_1"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_1_2"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_1_3"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_1_4"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_1_5"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_2_0"));
-array_push($ogl_results, extension_present($argv[1], "GL_VERSION_2_1"));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_1_1"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_1_2"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_1_3"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_1_4"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_1_5"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_2_0"));
+array_push($ogl_results, extension_present($log_file, "GL_VERSION_2_1"));
 
 echo implode(",", $ogl_results);
 
diff --git a/pts/test-resources/fhourstones/install.sh b/pts/test-resources/fhourstones/install.sh
index 1409f82..772f8c4 100755
--- a/pts/test-resources/fhourstones/install.sh
+++ b/pts/test-resources/fhourstones/install.sh
@@ -4,5 +4,5 @@ tar -xvf Fhourstones.tar.gz
 make -j $NUM_CPU_JOBS
 
 echo "#!/bin/sh
-./SearchGame < inputs 2>&1" > fhourstones-benchmark
+./SearchGame < inputs > \$LOG_FILE 2>&1" > fhourstones-benchmark
 chmod +x fhourstones-benchmark
diff --git a/pts/test-resources/fhourstones/parse-results.php b/pts/test-resources/fhourstones/parse-results.php
index 8d6f8f6..f3ab7db 100644
--- a/pts/test-resources/fhourstones/parse-results.php
+++ b/pts/test-resources/fhourstones/parse-results.php
@@ -1,6 +1,6 @@
 <?php
-
-$BENCHMARK_RESULTS = substr($argv[1], 0, strrpos($argv[1], "Kpos/sec"));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, 0, strrpos($log_file, "Kpos/sec"));
 echo trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, "msec =") + 6));
 
 ?>
diff --git a/pts/test-resources/gtkperf/install.sh b/pts/test-resources/gtkperf/install.sh
index d17d411..13b9b95 100755
--- a/pts/test-resources/gtkperf/install.sh
+++ b/pts/test-resources/gtkperf/install.sh
@@ -112,7 +112,7 @@ case "$1" in
 	;;
 esac
 
-./gtkperf_env/bin/gtkperf -a -c 2000 -t $test | grep "Total"
+./gtkperf_env/bin/gtkperf -a -c 2000 -t $test > $LOG_FILE
 
 EOT
 
diff --git a/pts/test-resources/gtkperf/parse-results.php b/pts/test-resources/gtkperf/parse-results.php
index dc08839..2973b83 100644
--- a/pts/test-resources/gtkperf/parse-results.php
+++ b/pts/test-resources/gtkperf/parse-results.php
@@ -1,6 +1,6 @@
 <?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "time:") + 5);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "time:") + 5);
 echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
 
 ?>
diff --git a/pts/test-resources/lightsmark/install.sh b/pts/test-resources/lightsmark/install.sh
index 6c36198..3cd126b 100755
--- a/pts/test-resources/lightsmark/install.sh
+++ b/pts/test-resources/lightsmark/install.sh
@@ -11,5 +11,5 @@ case \$OS_ARCH in
 	cd Lightsmark2008.2.0/bin/pc-linux32/
 	;;
 esac
-./backend \$@ 2>&1" > lightsmark
+./backend \$@ > \$LOG_FILE 2>&1" > lightsmark
 chmod +x lightsmark
diff --git a/pts/test-resources/lightsmark/parse-results.php b/pts/test-resources/lightsmark/parse-results.php
index 391ba8b..e046172 100644
--- a/pts/test-resources/lightsmark/parse-results.php
+++ b/pts/test-resources/lightsmark/parse-results.php
@@ -1,6 +1,6 @@
 <?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "average fps =") + 14);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "average fps =") + 14);
 $BENCHMARK_RESULTS = substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"));
 echo trim(substr($BENCHMARK_RESULTS, 0, strrpos($BENCHMARK_RESULTS, ".")));
 ?>
diff --git a/pts/test-resources/ramspeed/install.sh b/pts/test-resources/ramspeed/install.sh
index 4dbc2bf..5fe43ab 100755
--- a/pts/test-resources/ramspeed/install.sh
+++ b/pts/test-resources/ramspeed/install.sh
@@ -5,23 +5,23 @@ tar -xvf ramspeed-2.5.2.tar.gz
 echo "#!/bin/sh
 
 rm -f *.result
-./ramspeed \$@ > \$LOG_FILE
+./ramspeed \$@ > \$LOG_FILE.result
 
 case \"\$1\" in
 \"COPY\")
-	cat \$LOG_FILE | grep \"Copy\"
+	cat \$LOG_FILE.result | grep \"Copy\"
 	;;
 \"SCALE\")
-	cat \$LOG_FILE | grep \"Scale\"
+	cat \$LOG_FILE.result | grep \"Scale\"
 	;;
 \"ADD\")
-	cat \$LOG_FILE | grep \"Add\"
+	cat \$LOG_FILE.result | grep \"Add\"
 	;;
 \"TRIAD\")
-	cat \$LOG_FILE | grep \"Triad\"
+	cat \$LOG_FILE.result | grep \"Triad\"
 	;;
 \"AVERAGE\")
-	cat \$LOG_FILE | grep \"AVERAGE\"
+	cat \$LOG_FILE.result | grep \"AVERAGE\"
 	;;
 esac
 " > ramspeed-benchmark
diff --git a/pts/test-resources/scimark2/install.sh b/pts/test-resources/scimark2/install.sh
index 3044e3b..f97b5d4 100755
--- a/pts/test-resources/scimark2/install.sh
+++ b/pts/test-resources/scimark2/install.sh
@@ -10,26 +10,26 @@ cd scimark2_files/
 
 rm -f *.result
 
-./scimark2 -large  > \$LOG_FILE
+./scimark2 -large > \$LOG_FILE.result
 
 case \"\$1\" in
 \"TEST_COMPOSITE\")
-	cat \$LOG_FILE | grep \"Composite Score\"
+	cat \$LOG_FILE.result | grep \"Composite Score\"
 	;;
 \"TEST_FFT\")
-	cat \$LOG_FILE | grep \"FFT\"
+	cat \$LOG_FILE.result | grep \"FFT\"
 	;;
 \"TEST_SOR\")
-	cat \$LOG_FILE | grep \"SOR\"
+	cat \$LOG_FILE.result | grep \"SOR\"
 	;;
 \"TEST_MONTE\")
-	cat \$LOG_FILE | grep \"MonteCarlo\"
+	cat \$LOG_FILE.result | grep \"MonteCarlo\"
 	;;
 \"TEST_SPARSE\")
-	cat \$LOG_FILE | grep \"Sparse matmult\"
+	cat \$LOG_FILE.result | grep \"Sparse matmult\"
 	;;
 \"TEST_DENSE\")
-	cat \$LOG_FILE | grep \"LU\"
+	cat \$LOG_FILE.result | grep \"LU\"
 	;;
 esac" > scimark2
 chmod +x scimark2
diff --git a/pts/test-resources/tremulous/install.sh b/pts/test-resources/tremulous/install.sh
index 7ef9893..58387f8 100755
--- a/pts/test-resources/tremulous/install.sh
+++ b/pts/test-resources/tremulous/install.sh
@@ -8,6 +8,6 @@ mv demos/ tremulous_/tremulous/base/
 
 echo "#!/bin/sh
 cd tremulous_/tremulous/
-./tremulous.x86 \$@ 2>&1 | grep fps
-" > tremulous
+./tremulous.x86 \$@ > \$LOG_FILE 2>&1
+cat \$LOG_FILE | grep fps" > tremulous
 chmod +x tremulous
diff --git a/pts/test-resources/tremulous/parse-results.php b/pts/test-resources/tremulous/parse-results.php
index f75e04d..c17c021 100755
--- a/pts/test-resources/tremulous/parse-results.php
+++ b/pts/test-resources/tremulous/parse-results.php
@@ -1,6 +1,6 @@
 <?php
-
-$BENCHMARK_RESULTS = trim(substr($argv[1], 0, strrpos($argv[1], " fps")));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = trim(substr($log_file, 0, strrpos($log_file, " fps")));
 $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ' ')));
 echo $BENCHMARK_RESULTS;
 ?>