summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/scimark2
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-05-26 13:44:50 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-05-26 13:44:50 -0400
commit5b30b8af801ca001de98829023722b74d7c8ef3f (patch)
treedf50ab79f690e1056f2e72bbfdba1800b319fcbe /pts/test-resources/scimark2
parentb42d37270c2d45ac5d119431ddcb971b9b21a7cf (diff)
downloadphoronix-test-suite-upstream-5b30b8af801ca001de98829023722b74d7c8ef3f.tar.gz
phoronix-test-suite-upstream-5b30b8af801ca001de98829023722b74d7c8ef3f.tar.xz
phoronix-test-suite-upstream-5b30b8af801ca001de98829023722b74d7c8ef3f.zip
All test suites updated against latest available tests and Add
(missing) options to scimark2 and quite a bit of other test profile and test suite work...
Diffstat (limited to 'pts/test-resources/scimark2')
-rw-r--r--pts/test-resources/scimark2/install.sh25
-rw-r--r--pts/test-resources/scimark2/parse-results.php8
2 files changed, 30 insertions, 3 deletions
diff --git a/pts/test-resources/scimark2/install.sh b/pts/test-resources/scimark2/install.sh
index f289f69..330efcb 100644
--- a/pts/test-resources/scimark2/install.sh
+++ b/pts/test-resources/scimark2/install.sh
@@ -8,5 +8,28 @@ cd ..
echo "#!/bin/sh
cd scimark2_files/
-./scimark2 -large" > scimark2
+rm -f *.result
+
+./scimark2 -large > \$THIS_RUN_TIME.result
+
+case \"\$1\" in
+\"TEST_COMPOSITE\")
+ cat \$THIS_RUN_TIME.result | grep \"Composite Score\"
+ ;;
+\"TEST_FFT\")
+ cat \$THIS_RUN_TIME.result | grep \"FFT\"
+ ;;
+\"TEST_SOR\")
+ cat \$THIS_RUN_TIME.result | grep \"SOR\"
+ ;;
+\"TEST_MONTE\")
+ cat \$THIS_RUN_TIME.result | grep \"MonteCarlo\"
+ ;;
+\"TEST_SPARSE\")
+ cat \$THIS_RUN_TIME.result | grep \"Sparse matmult\"
+ ;;
+\"TEST_DENSE\")
+ cat \$THIS_RUN_TIME.result | grep \"LU\"
+ ;;
+esac" > scimark2
chmod +x scimark2
diff --git a/pts/test-resources/scimark2/parse-results.php b/pts/test-resources/scimark2/parse-results.php
index 8187b13..1f910b9 100644
--- a/pts/test-resources/scimark2/parse-results.php
+++ b/pts/test-resources/scimark2/parse-results.php
@@ -1,6 +1,10 @@
<?php
-$BENCHMARK_RESULTS = substr($argv[1], strpos($argv[1], "Composite Score:") + 16);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
+$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], ":") + 1));
+
+ if(($space_pos = strpos($BENCHMARK_RESULTS, " ")) > 0)
+ $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, $space_pos));
+
+echo $BENCHMARK_RESULTS;
?>