pts: Update specviewperf9 and specviewperf10 test profiles to use

$LOG_FILE

6 files changed, 40 insertions, 38 deletions

diff --git a/pts/test-profiles/specviewperf10.xml b/pts/test-profiles/specviewperf10.xml
index 4a08aa7..6c5085b 100644
--- a/pts/test-profiles/specviewperf10.xml
+++ b/pts/test-profiles/specviewperf10.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
diff --git a/pts/test-profiles/specviewperf9.xml b/pts/test-profiles/specviewperf9.xml
index 9f57236..77eed67 100644
--- a/pts/test-profiles/specviewperf9.xml
+++ b/pts/test-profiles/specviewperf9.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
diff --git a/pts/test-resources/specviewperf10/install.sh b/pts/test-resources/specviewperf10/install.sh
index 49096f8..1cbe1e0 100755
--- a/pts/test-resources/specviewperf10/install.sh
+++ b/pts/test-resources/specviewperf10/install.sh
@@ -20,36 +20,36 @@ threads \$NUM_CPU_CORES
 
 case \"\$1\" in
 \"3dsmax\")
-	./Run_3dsmax.csh
-	grep \"Composite Score\" results/3dsmax-04/*result.txt
+	./Run_3dsmax.csh > /dev/null 2>&1
+	cat results/3dsmax-04/*result.txt > \$LOG_FILE
 	;;
 \"catia\")
-	./Run_catia.csh
-	grep \"Composite Score\" results/catia-02/*result.txt
+	./Run_catia.csh > /dev/null 2>&1
+	cat results/catia-02/*result.txt > \$LOG_FILE
 	;;
 \"ensight\")
-	./Run_ensight.csh
-	grep \"Composite Score\" results/ensight-03/*result.txt
+	./Run_ensight.csh > /dev/null 2>&1
+	cat results/ensight-03/*result.txt > \$LOG_FILE
 	;;
 \"maya\")
-	./Run_maya.csh
-	grep \"Composite Score\" results/maya-02/*result.txt
+	./Run_maya.csh > /dev/null 2>&1
+	cat results/maya-02/*result.txt > \$LOG_FILE
 	;;
 \"proe\")
-	./Run_proe.csh
-	grep \"Composite Score\" results/proe-04/*result.txt
+	./Run_proe.csh > /dev/null 2>&1
+	cat results/proe-04/*result.txt > \$LOG_FILE
 	;;
 \"sw\")
-	./Run_sw.csh
-	grep \"Composite Score\" results/sw-01/*result.txt
+	./Run_sw.csh > /dev/null 2>&1
+	cat results/sw-01/*result.txt > \$LOG_FILE
 	;;
 \"tcvis\")
-	./Run_tcvis.csh
-	grep \"Composite Score\" results/tcvis-01/*result.txt
+	./Run_tcvis.csh > /dev/null 2>&1
+	cat results/tcvis-01/*result.txt > \$LOG_FILE
 	;;
 \"ugnx\")
-	./Run_ugnx.csh
-	grep \"Composite Score\" results/ugnx-01/*result.txt
+	./Run_ugnx.csh > /dev/null 2>&1
+	cat results/ugnx-01/*result.txt > \$LOG_FILE
 	;;
 esac" > specviewperf10
 chmod +x specviewperf10
diff --git a/pts/test-resources/specviewperf10/parse-results.php b/pts/test-resources/specviewperf10/parse-results.php
index a75992c..f7bdfa8 100644
--- a/pts/test-resources/specviewperf10/parse-results.php
+++ b/pts/test-resources/specviewperf10/parse-results.php
@@ -1,6 +1,7 @@
 <?php
 
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Composite Score :") + 17);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "Composite Score :") + 17);
 echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
 
 ?>
diff --git a/pts/test-resources/specviewperf9/install.sh b/pts/test-resources/specviewperf9/install.sh
index 7a8ed84..c7dbfdf 100755
--- a/pts/test-resources/specviewperf9/install.sh
+++ b/pts/test-resources/specviewperf9/install.sh
@@ -30,9 +30,9 @@ case \"\$1\" in
 	    mkdir sum_results/3dsmax
 	fi
 
-	./Run_Viewset.csh 3dsmax-04 3dsmax results
+	./Run_Viewset.csh 3dsmax-04 3dsmax results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/3dsmax/summary.txt
+	cat sum_results/3dsmax/summary.txt > \$LOG_FILE
 	;;
 \"catia\")
 	if [ ! -e sum_results/catia ]
@@ -40,9 +40,9 @@ case \"\$1\" in
 	    mkdir sum_results/catia
 	fi
 
-	./Run_Viewset.csh catia-02 catia results
+	./Run_Viewset.csh catia-02 catia results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/catia/summary.txt
+	cat sum_results/catia/summary.txt > \$LOG_FILE
 	;;
 \"ensight\")
 	if [ ! -e sum_results/ensight ]
@@ -50,9 +50,9 @@ case \"\$1\" in
 	    mkdir sum_results/ensight
 	fi
 
-	./Run_Viewset.csh ensight-03 ensight results
+	./Run_Viewset.csh ensight-03 ensight results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/ensight/summary.txt
+	cat sum_results/ensight/summary.txt > \$LOG_FILE
 	;;
 \"light\")
 	if [ ! -e sum_results/light ]
@@ -60,9 +60,9 @@ case \"\$1\" in
 	    mkdir sum_results/light
 	fi
 
-	./Run_Viewset.csh light-08 light results
+	./Run_Viewset.csh light-08 light results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/light/summary.txt
+	cat sum_results/light/summary.txt > \$LOG_FILE
 	;;
 \"maya\")
 	if [ ! -e sum_results/maya ]
@@ -70,9 +70,9 @@ case \"\$1\" in
 	    mkdir sum_results/maya
 	fi
 
-	./Run_Viewset.csh maya-02 maya results
+	./Run_Viewset.csh maya-02 maya results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/maya/summary.txt
+	cat sum_results/maya/summary.txt > \$LOG_FILE
 	;;
 \"proe\")
 	if [ ! -e sum_results/proe ]
@@ -80,9 +80,9 @@ case \"\$1\" in
 	    mkdir sum_results/proe
 	fi
 
-	./Run_Viewset.csh proe-04 proe results
+	./Run_Viewset.csh proe-04 proe results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/proe/summary.txt
+	cat sum_results/proe/summary.txt > \$LOG_FILE
 	;;
 \"sw\")
 	if [ ! -e sum_results/sw ]
@@ -90,9 +90,9 @@ case \"\$1\" in
 	    mkdir sum_results/sw
 	fi
 
-	./Run_Viewset.csh sw-01 sw results
+	./Run_Viewset.csh sw-01 sw results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/sw/summary.txt
+	cat sum_results/sw/summary.txt > \$LOG_FILE
 	;;
 \"ugnx\")
 	if [ ! -e sum_results/ugnx ]
@@ -100,9 +100,9 @@ case \"\$1\" in
 	    mkdir sum_results/ugnx
 	fi
 
-	./Run_Viewset.csh ugnx-01 ugnx results
+	./Run_Viewset.csh ugnx-01 ugnx results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/ugnx/summary.txt
+	cat sum_results/ugnx/summary.txt > \$LOG_FILE
 	;;
 \"tcvis\")
 	if [ ! -e sum_results/tcvis ]
@@ -110,9 +110,9 @@ case \"\$1\" in
 	    mkdir sum_results/tcvis
 	fi
 
-	./Run_Viewset.csh tcvis-01 tcvis results
+	./Run_Viewset.csh tcvis-01 tcvis results > /dev/null 2>&1
 
-	grep \"Mean\" sum_results/tcvis/summary.txt
+	cat sum_results/tcvis/summary.txt > \$LOG_FILE
 	;;
 esac
 " > specviewperf9
diff --git a/pts/test-resources/specviewperf9/parse-results.php b/pts/test-resources/specviewperf9/parse-results.php
index d29b5e4..965d3d5 100644
--- a/pts/test-resources/specviewperf9/parse-results.php
+++ b/pts/test-resources/specviewperf9/parse-results.php
@@ -1,6 +1,7 @@
 <?php
 
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "=") + 1);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "Mean =") + 6);
 echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
 
 ?>