summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/xplane9
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/xplane9
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/xplane9')
-rwxr-xr-xpts/test-resources/xplane9/install.sh6
-rw-r--r--pts/test-resources/xplane9/parse-results.php3
2 files changed, 5 insertions, 4 deletions
diff --git a/pts/test-resources/xplane9/install.sh b/pts/test-resources/xplane9/install.sh
index d97235a..bfd2d2e 100755
--- a/pts/test-resources/xplane9/install.sh
+++ b/pts/test-resources/xplane9/install.sh
@@ -7,12 +7,12 @@ cd X-Plane_900r3_timedemo/
case \$OS_TYPE in
\"MacOSX\" )
- ./X-Plane.app/Contents/MacOS/X-Plane \$@ > /dev/null
+ ./X-Plane.app/Contents/MacOS/X-Plane \$@
;;
* )
- ./X-Plane-i686 \$@ > /dev/null
+ ./X-Plane-i686 \$@
;;
esac
-grep FRAMERATE Log.txt" > xplane9
+grep FRAMERATE Log.txt > \$LOG_FILE" > xplane9
chmod +x xplane9
diff --git a/pts/test-resources/xplane9/parse-results.php b/pts/test-resources/xplane9/parse-results.php
index 0b0a279..f84b042 100644
--- a/pts/test-resources/xplane9/parse-results.php
+++ b/pts/test-resources/xplane9/parse-results.php
@@ -1,5 +1,6 @@
<?php
-$BENCHMARK_RESULTS = substr($argv[1], strpos($argv[1], "phase 1:") + 8);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strpos($log_file, "phase 1:") + 8);
$BENCHMARK_RESULTS = substr($BENCHMARK_RESULTS, strpos($BENCHMARK_RESULTS, "fps=") + 4);
$BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
echo $BENCHMARK_RESULTS;