summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/nexuiz
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-10-13 20:22:09 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-10-13 20:22:09 -0400
commitfb1688bcb3d187293ac6a68de3356ca4e2ec542f (patch)
tree7996f455e55991ae64ed210bb85fc1a6b833de7f /pts/test-resources/nexuiz
parent827fe07527081a15db12472a20d2e199fe71cf40 (diff)
downloadphoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.tar.gz
phoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.tar.xz
phoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.zip
pts: Many test profile updates
Diffstat (limited to 'pts/test-resources/nexuiz')
-rwxr-xr-xpts/test-resources/nexuiz/install.sh7
-rw-r--r--pts/test-resources/nexuiz/parse-results.php4
2 files changed, 6 insertions, 5 deletions
diff --git a/pts/test-resources/nexuiz/install.sh b/pts/test-resources/nexuiz/install.sh
index 0d5f69f..242fe17 100755
--- a/pts/test-resources/nexuiz/install.sh
+++ b/pts/test-resources/nexuiz/install.sh
@@ -9,10 +9,11 @@ echo "#!/bin/sh
cd Nexuiz_/
if [ \$OS_TYPE = \"MacOSX\" ]
then
- ./Nexuiz.app/Contents/MacOS/nexuiz-osx-agl +exec normal.cfg \$@ | grep fps
+ ./Nexuiz.app/Contents/MacOS/nexuiz-osx-agl +exec normal.cfg \$@ > \$LOG_FILE 2>&1
else
- ./nexuiz-linux-glx.sh +exec normal.cfg \$@ | grep fps
-fi" > nexuiz
+ ./nexuiz-linux-glx.sh +exec normal.cfg \$@ > \$LOG_FILE 2>&1
+fi
+cat \$LOG_FILE | grep fps" > nexuiz
chmod +x nexuiz
cd Nexuiz_/
diff --git a/pts/test-resources/nexuiz/parse-results.php b/pts/test-resources/nexuiz/parse-results.php
index c7e1a6c..34fffa2 100644
--- a/pts/test-resources/nexuiz/parse-results.php
+++ b/pts/test-resources/nexuiz/parse-results.php
@@ -1,6 +1,6 @@
<?php
-
-$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], "min/avg/max:") + 12));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = trim(substr($log_file, strrpos($log_file, "min/avg/max:") + 12));
$BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strpos($BENCHMARK_RESULTS, ' ')));
$BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, ' ')));
echo $BENCHMARK_RESULTS;