summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/quake4
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/quake4
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/quake4')
-rwxr-xr-xpts/test-resources/quake4/install.sh11
-rw-r--r--pts/test-resources/quake4/parse-results.php4
2 files changed, 8 insertions, 7 deletions
diff --git a/pts/test-resources/quake4/install.sh b/pts/test-resources/quake4/install.sh
index 85650d9..23430f1 100755
--- a/pts/test-resources/quake4/install.sh
+++ b/pts/test-resources/quake4/install.sh
@@ -6,7 +6,8 @@ chmod +x quake4-linux-1.4.2.x86.run
chmod +x bin/Linux/x86/quake4.x86
echo "#!/bin/sh
-./bin/Linux/x86/quake4.x86 \$@ | grep fps" > quake4
+./bin/Linux/x86/quake4.x86 \$@ > \$LOG_FILE 2>&1
+cat \$LOG_FILE | grep fps" > quake4
chmod +x quake4
tar -xvf quake4-pts-demo-1.tar.gz
@@ -16,13 +17,13 @@ mv -f pts.demo q4base/demos/pts.demo
if [ -f quake4-game-files.tar ]
then
tar -k -C $1/q4base -xvf $1/quake4-game-files.tar
+ else
+ echo "Quake 4 Game Files (*.pk4) Must Be Copied Into $1/q4base"
fi
if [ -f quake4-key.tar ]
then
tar -xvf quake4-key.tar
+ else
+ echo "Copy Your Game Key File To $HOME/.quake4/q4base/quake4key (If Not Already There)"
fi
-
-echo "Quake 4 Game Files (*.pk4) Must Be Copied Into $1/q4base"
-echo "Also Copy Your Game Key File To $HOME/.quake4/q4base/quake4key (If Not Already There)"
-
diff --git a/pts/test-resources/quake4/parse-results.php b/pts/test-resources/quake4/parse-results.php
index 6cf5b34..a538b81 100644
--- a/pts/test-resources/quake4/parse-results.php
+++ b/pts/test-resources/quake4/parse-results.php
@@ -1,5 +1,5 @@
<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "seconds =") + 9);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "seconds =") + 9);
echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps")));
?>