pts: More moving to $LOG_FILE usage

7 files changed, 15 insertions, 13 deletions

diff --git a/pts/test-resources/bonnie/install.sh b/pts/test-resources/bonnie/install.sh
index 5b031f1..fb6407b 100755
--- a/pts/test-resources/bonnie/install.sh
+++ b/pts/test-resources/bonnie/install.sh
@@ -16,5 +16,5 @@ echo \$1 > TEST_TYPE
 BONNIERAM=\$((\$SYS_MEMORY * 2))
 rm -rf scratch_dir/
 mkdir scratch_dir/
-./bonnie_/sbin/bonnie++ -d scratch_dir/ -s \$BONNIERAM 2>&1" > bonnie
+./bonnie_/sbin/bonnie++ -d scratch_dir/ -s \$BONNIERAM > \$LOG_FILE 2>&1" > bonnie
 chmod +x bonnie
diff --git a/pts/test-resources/bonnie/parse-results.php b/pts/test-resources/bonnie/parse-results.php
index 2850954..00bd19d 100644
--- a/pts/test-resources/bonnie/parse-results.php
+++ b/pts/test-resources/bonnie/parse-results.php
@@ -1,6 +1,6 @@
 <?php
 
-$results = trim($argv[1]);
+$results = trim(file_get_contents(getenv("LOG_FILE")));
 $BENCHMARK_RESULTS = trim(substr($results, strrpos($results, "\n") + 1));
 
 $test_parts = explode(",", $BENCHMARK_RESULTS);
diff --git a/pts/test-resources/compress-7zip/install.sh b/pts/test-resources/compress-7zip/install.sh
index 64a75ac..91ff61a 100755
--- a/pts/test-resources/compress-7zip/install.sh
+++ b/pts/test-resources/compress-7zip/install.sh
@@ -6,5 +6,5 @@ make -j $NUM_CPU_JOBS
 cd ..
 
 echo "#!/bin/sh
-./p7zip_4.58/bin/7za b" > compress-7zip
+./p7zip_4.58/bin/7za b > \$LOG_FILE 2>&1" > compress-7zip
 chmod +x compress-7zip
diff --git a/pts/test-resources/compress-7zip/parse-results.php b/pts/test-resources/compress-7zip/parse-results.php
index e8bad66..461ca3e 100644
--- a/pts/test-resources/compress-7zip/parse-results.php
+++ b/pts/test-resources/compress-7zip/parse-results.php
@@ -1,6 +1,7 @@
 <?php
 
-$BENCHMARK_RESULTS = substr($argv[1], strpos($argv[1], "Avr:"));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strpos($log_file, "Avr:"));
 $BENCHMARK_RESULTS = substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"));
 $array = explode(" ", $BENCHMARK_RESULTS);
 $array2 = array();
diff --git a/pts/test-resources/java-scimark2/install.sh b/pts/test-resources/java-scimark2/install.sh
index 285e3c7..2ffa215 100755
--- a/pts/test-resources/java-scimark2/install.sh
+++ b/pts/test-resources/java-scimark2/install.sh
@@ -5,26 +5,26 @@ unzip -o scimark2lib.zip
 echo "#!/bin/sh
 
 rm -f *.result
-java jnt.scimark2.commandline > \$THIS_RUN_TIME.result
+java jnt.scimark2.commandline > \$LOG_FILE
 
 case \"\$1\" in
 \"TEST_COMPOSITE\")
-	cat \$THIS_RUN_TIME.result | grep \"Composite Score\"
+	cat \$LOG_FILE | grep \"Composite Score\"
 	;;
 \"TEST_FFT\")
-	cat \$THIS_RUN_TIME.result | grep \"FFT (1024)\"
+	cat \$LOG_FILE | grep \"FFT (1024)\"
 	;;
 \"TEST_SOR\")
-	cat \$THIS_RUN_TIME.result | grep \"SOR (100x100)\"
+	cat \$LOG_FILE | grep \"SOR (100x100)\"
 	;;
 \"TEST_MONTE\")
-	cat \$THIS_RUN_TIME.result | grep \"Monte Carlo\"
+	cat \$LOG_FILE | grep \"Monte Carlo\"
 	;;
 \"TEST_SPARSE\")
-	cat \$THIS_RUN_TIME.result | grep \"Sparse matmult\"
+	cat \$LOG_FILE | grep \"Sparse matmult\"
 	;;
 \"TEST_DENSE\")
-	cat \$THIS_RUN_TIME.result | grep \"LU (100x100)\"
+	cat \$LOG_FILE | grep \"LU (100x100)\"
 	;;
 esac" > java-scimark2
 chmod +x java-scimark2
diff --git a/pts/test-resources/openssl/install.sh b/pts/test-resources/openssl/install.sh
index 161cb84..182e2be 100755
--- a/pts/test-resources/openssl/install.sh
+++ b/pts/test-resources/openssl/install.sh
@@ -8,7 +8,7 @@ cd ..
 
 echo "#!/bin/sh
 cd openssl-0.9.8h/
-./apps/openssl speed rsa4096 -multi \$NUM_CPU_CORES" > openssl
+./apps/openssl speed rsa4096 -multi \$NUM_CPU_CORES > \$LOG_FILE 2>&1" > openssl
 chmod +x openssl
 
 
diff --git a/pts/test-resources/openssl/parse-results.php b/pts/test-resources/openssl/parse-results.php
index aff022f..32aa940 100644
--- a/pts/test-resources/openssl/parse-results.php
+++ b/pts/test-resources/openssl/parse-results.php
@@ -1,6 +1,7 @@
 <?php
 
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "rsa 4096 bits") + 13);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "rsa 4096 bits") + 13);
 
 $i = 0;
 foreach(explode(" ", $BENCHMARK_RESULTS) as $item)