diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-29 14:27:59 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-29 14:27:59 -0500 |
| commit | b69fcfb7f641eb4e0f958cdc8c3d279c01f08980 (patch) | |
| tree | fa7dd30d76e77f4d07f26c186c7d44e8314896de | |
| parent | 78bc858480125fcc641d3e1a2bd604d81eaae2c4 (diff) | |
| download | phoronix-test-suite-upstream-b69fcfb7f641eb4e0f958cdc8c3d279c01f08980.tar.gz phoronix-test-suite-upstream-b69fcfb7f641eb4e0f958cdc8c3d279c01f08980.tar.xz phoronix-test-suite-upstream-b69fcfb7f641eb4e0f958cdc8c3d279c01f08980.zip | |
pts: Use $LOG_FILE with stresscpu2 and vdrift test profiles
| -rw-r--r-- | pts/test-profiles/stresscpu2.xml | 2 | ||||
| -rw-r--r-- | pts/test-profiles/vdrift.xml | 2 | ||||
| -rwxr-xr-x | pts/test-resources/stresscpu2/install.sh | 4 | ||||
| -rw-r--r-- | pts/test-resources/stresscpu2/parse-results.php | 4 | ||||
| -rwxr-xr-x | pts/test-resources/vdrift/install.sh | 2 | ||||
| -rw-r--r-- | pts/test-resources/vdrift/parse-results.php | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/pts/test-profiles/stresscpu2.xml b/pts/test-profiles/stresscpu2.xml index fbfa5b2..dd8de02 100644 --- a/pts/test-profiles/stresscpu2.xml +++ b/pts/test-profiles/stresscpu2.xml @@ -1,6 +1,6 @@ <PhoronixTestSuite> <TestProfile> - <Version>1.0.0</Version> + <Version>1.0.1</Version> <TestType>Processor</TestType> <SoftwareType>Other</SoftwareType> <License>FREE</License> diff --git a/pts/test-profiles/vdrift.xml b/pts/test-profiles/vdrift.xml index dbcc7b7..015edc6 100644 --- a/pts/test-profiles/vdrift.xml +++ b/pts/test-profiles/vdrift.xml @@ -1,6 +1,6 @@ <PhoronixTestSuite> <TestProfile> - <Version>0.0.1</Version> + <Version>0.0.2</Version> <TestType>Graphics</TestType> <SoftwareType>Game</SoftwareType> <License>FREE</License> diff --git a/pts/test-resources/stresscpu2/install.sh b/pts/test-resources/stresscpu2/install.sh index fa511bc..0030532 100755 --- a/pts/test-resources/stresscpu2/install.sh +++ b/pts/test-resources/stresscpu2/install.sh @@ -6,10 +6,10 @@ cat> launch <<'EOT' #!/bin/sh case $OS_ARCH in x86_64) - stresscpu2/stresscpu2_linux64 -t $@ | grep ERROR + stresscpu2/stresscpu2_linux64 -t $@ | grep ERROR > $LOG_FILE ;; i?86 | i86*) - stresscpu2/stresscpu2_linux32 -t $@ | grep ERROR + stresscpu2/stresscpu2_linux32 -t $@ | grep ERROR > $LOG_FILE ;; esac EOT diff --git a/pts/test-resources/stresscpu2/parse-results.php b/pts/test-resources/stresscpu2/parse-results.php index adcb460..b9e15e8 100644 --- a/pts/test-resources/stresscpu2/parse-results.php +++ b/pts/test-resources/stresscpu2/parse-results.php @@ -1,6 +1,8 @@ <?php -if ("" == $argv[1]) +$log_file = trim(file_get_contents(getenv("LOG_FILE"))); + +if($log_file == "") echo "PASS"; else echo "FAIL"; diff --git a/pts/test-resources/vdrift/install.sh b/pts/test-resources/vdrift/install.sh index d7784d5..a4e6630 100755 --- a/pts/test-resources/vdrift/install.sh +++ b/pts/test-resources/vdrift/install.sh @@ -16,6 +16,6 @@ cd .. echo "#!/bin/sh cd vdrift-08-05-08/ -./build/vdrift -benchmark" > vdrift +./build/vdrift -benchmark > \$LOG_FILE 2>&1" > vdrift chmod +x vdrift diff --git a/pts/test-resources/vdrift/parse-results.php b/pts/test-resources/vdrift/parse-results.php index 4fe0999..1f6bcd1 100644 --- a/pts/test-resources/vdrift/parse-results.php +++ b/pts/test-resources/vdrift/parse-results.php @@ -1,6 +1,7 @@ <?php -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "FPS:") + 4); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "FPS:") + 4); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"))); ?> |