summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-31 12:44:00 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-31 12:44:00 -0500
commitd732d35cd516d8023a1b174d8d6e71c5072df399 (patch)
treec5dab3c9da07b8d42ed09c09af2df4da9d54ac84
parentc5428b8a6188b8452cac7db1adbebb0305444ac5 (diff)
downloadphoronix-test-suite-upstream-d732d35cd516d8023a1b174d8d6e71c5072df399.tar.gz
phoronix-test-suite-upstream-d732d35cd516d8023a1b174d8d6e71c5072df399.tar.xz
phoronix-test-suite-upstream-d732d35cd516d8023a1b174d8d6e71c5072df399.zip
pts: Update and fix specviewperf10 test profile
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts/test-profiles/specviewperf10.xml12
-rwxr-xr-xpts/test-resources/specviewperf10/install.sh8
-rw-r--r--pts/test-suites/opengl-workstation.xml9
4 files changed, 22 insertions, 8 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index a396d3a..99160bb 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -26,6 +26,7 @@ Phoronix Test Suite (Git)
- pts: Add graphics-magick to multicore test suite due to its use of OpenMP
- pts: Update lzma download link for compress-lzma test profile
- pts: Adjust more test profiles from using $argv to $LOG_FILE
+- pts: Update and fix specviewperf10 test profile
- pts_Graph: Tweak formatting of basic graph attributes
- pts_Graph: When rendering a graph on a percent basis, format scale for 100-point basis
- pts_Graph: Add more stock colors to painter
diff --git a/pts/test-profiles/specviewperf10.xml b/pts/test-profiles/specviewperf10.xml
index 6c5085b..32b5f11 100644
--- a/pts/test-profiles/specviewperf10.xml
+++ b/pts/test-profiles/specviewperf10.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.0.1</Version>
+ <Version>1.1.0</Version>
<TestType>Graphics</TestType>
<SoftwareType>Utility</SoftwareType>
<License>FREE</License>
@@ -21,6 +21,16 @@
</TestInformation>
<TestSettings>
<Option>
+ <DisplayName>Resolution</DisplayName>
+ <Identifier>auto-resolution</Identifier>
+ <Menu>
+ <Entry>
+ <Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+ <Value>$VIDEO_WIDTH $VIDEO_HEIGHT</Value>
+ </Entry>
+ </Menu>
+ </Option>
+ <Option>
<DisplayName>SPECViewPerf Test</DisplayName>
<Identifier>run-test</Identifier>
<Menu>
diff --git a/pts/test-resources/specviewperf10/install.sh b/pts/test-resources/specviewperf10/install.sh
index 1cbe1e0..5f9fddc 100755
--- a/pts/test-resources/specviewperf10/install.sh
+++ b/pts/test-resources/specviewperf10/install.sh
@@ -13,12 +13,10 @@ echo "#!/bin/sh
cd SPECViewperf10/viewperf/viewperf10.0/
-echo \"screenHeight \$VIDEO_HEIGHT
-screenWidth \$VIDEO_WIDTH
-threads \$NUM_CPU_CORES
-\" > viewperf.config
+echo \"screenHeight \$2
+screenWidth \$1\" > viewperf.config
-case \"\$1\" in
+case \"\$3\" in
\"3dsmax\")
./Run_3dsmax.csh > /dev/null 2>&1
cat results/3dsmax-04/*result.txt > \$LOG_FILE
diff --git a/pts/test-suites/opengl-workstation.xml b/pts/test-suites/opengl-workstation.xml
index f530d53..0c37907 100644
--- a/pts/test-suites/opengl-workstation.xml
+++ b/pts/test-suites/opengl-workstation.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<SuiteInformation>
- <Version>1.0.1</Version>
+ <Version>1.0.2</Version>
<TestType>System</TestType>
<Title>OpenGL Workstation Test Suite</Title>
<Maintainer>Michael Larabel</Maintainer>
@@ -23,10 +23,15 @@
</RunTest>
<RunTest>
<Test>specviewperf10</Test>
- <Arguments>maya</Arguments>
+ <Arguments>$VIDEO_WIDTH $VIDEO_HEIGHT maya</Arguments>
<Description>Maya</Description>
</RunTest>
<RunTest>
+ <Test>specviewperf10</Test>
+ <Arguments>$VIDEO_WIDTH $VIDEO_HEIGHT ugnx</Arguments>
+ <Description>UGNX</Description>
+ </RunTest>
+ <RunTest>
<Test>xplane9</Test>
<Arguments>--fps_test=2 --pref:_x_res_req_ALL=$VIDEO_WIDTH --pref:_y_res_req_ALL=$VIDEO_HEIGHT --no_sound</Arguments>
<Description>$VIDEO_WIDTH x $VIDEO_HEIGHT - High Quality</Description>