summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/sunflow
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-10-09 20:26:59 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-10-09 20:26:59 -0400
commit5eeedd8b26e69d59729ef83f2fc834552a407fb5 (patch)
tree745a60f1e0e9af1e24afce83f0d620dc9cd2d8ef /pts/test-resources/sunflow
parent6045ce4f8be18c0f48cb372893d8269c652643d1 (diff)
downloadphoronix-test-suite-upstream-5eeedd8b26e69d59729ef83f2fc834552a407fb5.tar.gz
phoronix-test-suite-upstream-5eeedd8b26e69d59729ef83f2fc834552a407fb5.tar.xz
phoronix-test-suite-upstream-5eeedd8b26e69d59729ef83f2fc834552a407fb5.zip
pts: Update many test profiles to using $LOG_FILE
pts-core: Various minor tweaks in the functions run file
Diffstat (limited to 'pts/test-resources/sunflow')
-rwxr-xr-xpts/test-resources/sunflow/install.sh3
-rw-r--r--pts/test-resources/sunflow/parse-results.php3
2 files changed, 3 insertions, 3 deletions
diff --git a/pts/test-resources/sunflow/install.sh b/pts/test-resources/sunflow/install.sh
index 2a8c99e..96a4b05 100755
--- a/pts/test-resources/sunflow/install.sh
+++ b/pts/test-resources/sunflow/install.sh
@@ -15,6 +15,5 @@ else
JAVA_VM_MEMORY=256M
fi
-java -server -Xmx\$JAVA_VM_MEMORY -jar sunflow.jar -bench
-" > sunflow-benchmark
+java -server -Xmx\$JAVA_VM_MEMORY -jar sunflow.jar -bench > \$LOG_FILE 2>&1" > sunflow-benchmark
chmod +x sunflow-benchmark
diff --git a/pts/test-resources/sunflow/parse-results.php b/pts/test-resources/sunflow/parse-results.php
index 1eab65a..81ffda8 100644
--- a/pts/test-resources/sunflow/parse-results.php
+++ b/pts/test-resources/sunflow/parse-results.php
@@ -1,6 +1,7 @@
<?php
-$BENCHMARK_RESULTS = substr($argv[1], strpos($argv[1], "Average:"));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strpos($log_file, "Average:"));
$BENCHMARK_RESULTS = substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"));
preg_match("/([0-9\.:]*)(.{0,2})/", trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ':') + 1)), $match);