diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-11 18:58:12 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-11 18:58:12 -0400 |
| commit | 761e3b90aab641ca3bb8d211a11b58d6f55d8288 (patch) | |
| tree | afac9ec73c0fccf39d884f00bf9249f06fd0359f /pts | |
| parent | ce4a0ad557845bdde967998025c27ff17ee516b7 (diff) | |
| download | phoronix-test-suite-upstream-761e3b90aab641ca3bb8d211a11b58d6f55d8288.tar.gz phoronix-test-suite-upstream-761e3b90aab641ca3bb8d211a11b58d6f55d8288.tar.xz phoronix-test-suite-upstream-761e3b90aab641ca3bb8d211a11b58d6f55d8288.zip | |
pts: A variety of changes
Diffstat (limited to 'pts')
| -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 |
3 files changed, 6 insertions, 3 deletions
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 |