diff options
| -rw-r--r-- | EXPERIMENTAL-CHANGE-LOG | 1 | ||||
| -rwxr-xr-x | pts/test-resources/compliance-ogl/install.sh | 3 | ||||
| -rwxr-xr-x | pts/test-resources/iozone/install.sh | 2 | ||||
| -rw-r--r-- | pts/test-resources/iozone/parse-results.php | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/EXPERIMENTAL-CHANGE-LOG b/EXPERIMENTAL-CHANGE-LOG index 5665ccc..343ef60 100644 --- a/EXPERIMENTAL-CHANGE-LOG +++ b/EXPERIMENTAL-CHANGE-LOG @@ -14,6 +14,7 @@ Phoronix Test Suite - pts-core: Keep a running average how long it takes to run a given test. This is stored in the AverageRunTime tag within the pts-install.xml - pts-core: Show average run-time with info <test> command - pts-core: Don't pass $test_results as an argument to parse-results.sh or parse-results.php with tests using $LOG_FILE +- pts: Move more test profiles to using $LOG_FILE for result information - pts_Graph: Set viewbox in SVG renderer Phoronix Test Suite 1.4.0 Alpha 2 diff --git a/pts/test-resources/compliance-ogl/install.sh b/pts/test-resources/compliance-ogl/install.sh index 1161d65..e590a6d 100755 --- a/pts/test-resources/compliance-ogl/install.sh +++ b/pts/test-resources/compliance-ogl/install.sh @@ -7,6 +7,7 @@ cd .. cat > compliance-ogl << 'EOT' #!/bin/sh -LD_LIBRARY_PATH=glew/lib:$LD_LIBRARY_PATH ./glew/bin/glewinfo | grep GL_VERSION +LD_LIBRARY_PATH=glew/lib:$LD_LIBRARY_PATH ./glew/bin/glewinfo > \$LOG_FILE +cat \$LOG_FILE | grep GL_VERSION EOT chmod +x compliance-ogl diff --git a/pts/test-resources/iozone/install.sh b/pts/test-resources/iozone/install.sh index de437bf..122ba50 100755 --- a/pts/test-resources/iozone/install.sh +++ b/pts/test-resources/iozone/install.sh @@ -14,5 +14,5 @@ esac echo "#!/bin/sh iozone_ram=\$((\$SYS_MEMORY * 2)) -iozone3_308/src/current/iozone -s \${iozone_ram}M \$@ 2>&1" > ../../../iozone +iozone3_308/src/current/iozone -s \${iozone_ram}M \$@ > \$LOG_FILE 2>&1" > ../../../iozone chmod +x ../../../iozone diff --git a/pts/test-resources/iozone/parse-results.php b/pts/test-resources/iozone/parse-results.php index 2bece97..9a7ee17 100644 --- a/pts/test-resources/iozone/parse-results.php +++ b/pts/test-resources/iozone/parse-results.php @@ -1,7 +1,9 @@ <?php +$log_file = file_get_contents(getenv("LOG_FILE")); + // find the line with "reclean" on it -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "reclen")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "reclen")); // skip to the next line $BENCHMARK_RESULTS = substr($BENCHMARK_RESULTS, 1+strpos($BENCHMARK_RESULTS, "\n")); // remove stuff after this line |