summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/warsow
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/warsow
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/warsow')
-rwxr-xr-xpts/test-resources/warsow/install.sh7
-rw-r--r--pts/test-resources/warsow/parse-results.php4
2 files changed, 6 insertions, 5 deletions
diff --git a/pts/test-resources/warsow/install.sh b/pts/test-resources/warsow/install.sh
index 5e691ac..6f4a14b 100755
--- a/pts/test-resources/warsow/install.sh
+++ b/pts/test-resources/warsow/install.sh
@@ -10,14 +10,15 @@ chmod +x warsow.i386
cd ..
echo "#!/bin/sh
+rm -f .warsow/basewsw/1.log
cd warsow_0.42_unified/
case \$OS_ARCH in
\"x86_64\" )
- ./warsow.x86_64 +logconsole 1 \$@ | grep seconds
+ ./warsow.x86_64 \$@ > \$LOG_FILE 2>&1
;;
* )
- ./warsow.i386 +logconsole 1 \$@ | grep seconds
+ ./warsow.i386 \$@ > \$LOG_FILE 2>&1
;;
esac
-cat ../.warsow/basewsw/1.log | grep seconds" > warsow
+cat \$LOG_FILE | grep seconds" > warsow
chmod +x warsow
diff --git a/pts/test-resources/warsow/parse-results.php b/pts/test-resources/warsow/parse-results.php
index 05e160a..91c69b1 100644
--- a/pts/test-resources/warsow/parse-results.php
+++ b/pts/test-resources/warsow/parse-results.php
@@ -1,6 +1,6 @@
<?php
-
-$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], "seconds:") + 9));
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = trim(substr($log_file, strrpos($log_file, "seconds:") + 9));
$BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps")));
echo $BENCHMARK_RESULTS;
?>