diff options
| -rw-r--r-- | pts/test-profiles/scimark2.xml | 2 | ||||
| -rwxr-xr-x | pts/test-resources/scimark2/install.sh | 12 | ||||
| -rw-r--r-- | pts/test-resources/scimark2/parse-results.php | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pts/test-profiles/scimark2.xml b/pts/test-profiles/scimark2.xml index c431653..d3094ea 100644 --- a/pts/test-profiles/scimark2.xml +++ b/pts/test-profiles/scimark2.xml @@ -1,6 +1,6 @@ <PhoronixTestSuite> <TestProfile> - <Version>1.1.0</Version> + <Version>1.1.1</Version> <TestType>Processor</TestType> <SoftwareType>Utility</SoftwareType> <License>FREE</License> diff --git a/pts/test-resources/scimark2/install.sh b/pts/test-resources/scimark2/install.sh index f97b5d4..c3435ee 100755 --- a/pts/test-resources/scimark2/install.sh +++ b/pts/test-resources/scimark2/install.sh @@ -14,22 +14,22 @@ rm -f *.result case \"\$1\" in \"TEST_COMPOSITE\") - cat \$LOG_FILE.result | grep \"Composite Score\" + cat \$LOG_FILE.result | grep \"Composite Score\" > \$LOG_FILE ;; \"TEST_FFT\") - cat \$LOG_FILE.result | grep \"FFT\" + cat \$LOG_FILE.result | grep \"FFT\" > \$LOG_FILE ;; \"TEST_SOR\") - cat \$LOG_FILE.result | grep \"SOR\" + cat \$LOG_FILE.result | grep \"SOR\" > \$LOG_FILE ;; \"TEST_MONTE\") - cat \$LOG_FILE.result | grep \"MonteCarlo\" + cat \$LOG_FILE.result | grep \"MonteCarlo\" > \$LOG_FILE ;; \"TEST_SPARSE\") - cat \$LOG_FILE.result | grep \"Sparse matmult\" + cat \$LOG_FILE.result | grep \"Sparse matmult\" > \$LOG_FILE ;; \"TEST_DENSE\") - cat \$LOG_FILE.result | grep \"LU\" + cat \$LOG_FILE.result | grep \"LU\" > \$LOG_FILE ;; esac" > scimark2 chmod +x scimark2 diff --git a/pts/test-resources/scimark2/parse-results.php b/pts/test-resources/scimark2/parse-results.php index 1f910b9..c113d9a 100644 --- a/pts/test-resources/scimark2/parse-results.php +++ b/pts/test-resources/scimark2/parse-results.php @@ -1,6 +1,7 @@ <?php -$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], ":") + 1)); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, strrpos($log_file, ":") + 1)); if(($space_pos = strpos($BENCHMARK_RESULTS, " ")) > 0) $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, $space_pos)); |