diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-29 13:59:02 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-29 13:59:02 -0500 |
| commit | a5961131af63c23a5570b1b82074ddb76f96f6a8 (patch) | |
| tree | ed6f6719721890beaf6a17e150619ed4d0180f0b | |
| parent | c3da36c800ddac04b4e3bf7b80b98962b4bf6a9b (diff) | |
| download | phoronix-test-suite-upstream-a5961131af63c23a5570b1b82074ddb76f96f6a8.tar.gz phoronix-test-suite-upstream-a5961131af63c23a5570b1b82074ddb76f96f6a8.tar.xz phoronix-test-suite-upstream-a5961131af63c23a5570b1b82074ddb76f96f6a8.zip | |
pts: Use $LOG_FILE in video-extensions test profile
| -rw-r--r-- | pts/test-profiles/video-extensions.xml | 2 | ||||
| -rwxr-xr-x | pts/test-resources/video-extensions/install.sh | 4 | ||||
| -rw-r--r-- | pts/test-resources/video-extensions/parse-results.php | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pts/test-profiles/video-extensions.xml b/pts/test-profiles/video-extensions.xml index 489e915..08da1af 100644 --- a/pts/test-profiles/video-extensions.xml +++ b/pts/test-profiles/video-extensions.xml @@ -1,6 +1,6 @@ <PhoronixTestSuite> <TestProfile> - <Version>1.1.0</Version> + <Version>1.1.1</Version> <TestType>Graphics</TestType> <SoftwareType>Benchmark</SoftwareType> <License>FREE</License> diff --git a/pts/test-resources/video-extensions/install.sh b/pts/test-resources/video-extensions/install.sh index c1fa551..12ff7c5 100755 --- a/pts/test-resources/video-extensions/install.sh +++ b/pts/test-resources/video-extensions/install.sh @@ -6,7 +6,7 @@ THIS_DIR=$(pwd) mkdir $THIS_DIR/mplayer_ cd MPlayer-1.0rc2/ -./configure --enable-xv --enable-xvmc --prefix=$THIS_DIR/mplayer_ > /dev/null +./configure --enable-xv --enable-xvmc --disable-ivtv --prefix=$THIS_DIR/mplayer_ > /dev/null make -j $NUM_CPU_JOBS make install cd .. @@ -45,5 +45,5 @@ EOT echo "#!/bin/sh -\$PHP_BIN mplayer-runner.php" > video-extensions +\$PHP_BIN mplayer-runner.php > \$LOG_FILE 2>&1" > video-extensions chmod +x video-extensions diff --git a/pts/test-resources/video-extensions/parse-results.php b/pts/test-resources/video-extensions/parse-results.php index 978a5c8..fa99dc6 100644 --- a/pts/test-resources/video-extensions/parse-results.php +++ b/pts/test-resources/video-extensions/parse-results.php @@ -1,5 +1,7 @@ <?php -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Final Results:") + 14); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "Final Results:") + 14); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "."))); + ?> |