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...

24 files changed, 214 insertions, 76 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index a40aa24..5790415 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -9,6 +9,9 @@ Phoronix Test Suite
 - Many (all) test profiles updated/fixed/finalized.
 - Switch pts-trondheim.wav default audio file... NOW FINALIZED.
 - Add support so phoronix-test-suite benchmark <Saved File Name> can be used to run the same tests found in an existing PTS saved file. Similar to running phoronix-test-suite benchmark <Test or Suite> and then entering the same saved file name to save the results into an existing file. This support has also been added for the install and run options.
+- Add gaming, gaming-free, and gaming-closed suites for gaming tests
+- All test suites updated against latest available tests
+- Add (missing) options to scimark2
 
 Phoronix Test Suite 0.8.0
 May 24, 2008
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index 562729a..5a951a7 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -353,6 +353,7 @@ switch($COMMAND)
 				$saved_identifier = array_pop(explode('/', dirname($benchmark_file)));
 				pts_remove_saved_result($saved_identifier);
 			}
+			echo "\n";
 		}
 		break;
 	case "REMOVE_RESULT":
diff --git a/pts/test-profiles/java-scimark2.xml b/pts/test-profiles/java-scimark2.xml
index 984cf67..c65e98f 100644
--- a/pts/test-profiles/java-scimark2.xml
+++ b/pts/test-profiles/java-scimark2.xml
@@ -33,7 +33,7 @@
 					<Value>FFT</Value>
 				</Entry>
 				<Entry>
-					<Name>Jacobi Successive Over-relaxation</Name>
+					<Name>Jacobi Successive Over-Relaxation</Name>
 					<Value>SOR</Value>
 				</Entry>
 				<Entry>
diff --git a/pts/test-profiles/scimark2.xml b/pts/test-profiles/scimark2.xml
index b08930b..5d05906 100644
--- a/pts/test-profiles/scimark2.xml
+++ b/pts/test-profiles/scimark2.xml
@@ -19,4 +19,37 @@
 		<Description>This test runs the ANSI C version of SciMark 2.0, which is a benchmark for scientific and numerical computing developed by programmers at the National Institute of Standards and Technology. This test is made up of Fast Foruier Transform, Jacobi Successive Over-relaxation, Monte Carlo, Sparse Matrix Multiply, and dense LU matrix factorization benchmarks.</Description>
                 <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
+	<TestSettings>
+		<Option>
+			<DisplayName>Computational Test</DisplayName>
+			<Identifier>compute-test</Identifier>
+			<ArgumentName>TEST_</ArgumentName>
+			<Menu>
+				<Entry>
+					<Name>Composite</Name>
+					<Value>COMPOSITE</Value>
+				</Entry>
+				<Entry>
+					<Name>Fast Fourier Transform</Name>
+					<Value>FFT</Value>
+				</Entry>
+				<Entry>
+					<Name>Jacobi Successive Over-Relaxation</Name>
+					<Value>SOR</Value>
+				</Entry>
+				<Entry>
+					<Name>Monte Carlo</Name>
+					<Value>MONTE</Value>
+				</Entry>
+				<Entry>
+					<Name>Sparse Matrix Multiply</Name>
+					<Value>SPARSE</Value>
+				</Entry>
+				<Entry>
+					<Name>Dense LU Matrix Factorization</Name>
+					<Value>DENSE</Value>
+				</Entry>
+			</Menu>
+		</Option>
+	</TestSettings>
 </PhoronixTestSuite>
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;
 
 ?>
diff --git a/pts/test-suites/audio-encoding.xml b/pts/test-suites/audio-encoding.xml
index 01d7a96..44b9162 100644
--- a/pts/test-suites/audio-encoding.xml
+++ b/pts/test-suites/audio-encoding.xml
@@ -1,8 +1,8 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
-		<Title>Audio Encoding Test Suite</Title>
+		<Title>Audio Encoding</Title>
 		<Maintainer>Michael Larabel</Maintainer>
 		<Description>This test suite consists of benchmarks that measure the amount of time needed to encode a sample WAV file to various audio formats. Among the formats are MP3, Ogg, and FLAC. This suite is good for testing the system's processor, memory, and overall system performance.</Description>
 	</SuiteInformation>
diff --git a/pts/test-suites/compilation.xml b/pts/test-suites/compilation.xml
index 7191222..e8da439 100644
--- a/pts/test-suites/compilation.xml
+++ b/pts/test-suites/compilation.xml
@@ -1,10 +1,10 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
-		<Title>Timed Code Compilation Tests</Title>
+		<Title>Timed Code Compilation</Title>
 		<Maintainer>Michael Larabel</Maintainer>
-		<Description>This test suite consists of benchmarks that measure the amount of time needed to build common open-source software packages. These benchmarks will use your default compiler (likely GCC) and will adjust the number of compiling jobs based upon the number of detected CPU cores in your system. This suite is good for testing the system's processor, memory, and overall system performance.</Description>
+		<Description>This test suite consists of tests that measure the amount of time needed to build common open-source software packages. These tests will use your default compiler (likely GCC) and will adjust the number of compiling jobs based upon the number of detected CPU cores in your system. This suite is good for testing the system's processor, memory, and overall system performance.</Description>
 	</SuiteInformation>
 	<RunTest>
 		<Test>build-mplayer</Test>
@@ -18,4 +18,7 @@
 	<RunTest>
 		<Test>build-imagemagick</Test>
 	</RunTest>
+	<RunTest>
+		<Test>build-linux-kernel</Test>
+	</RunTest>
 </PhoronixTestSuite>
diff --git a/pts/test-suites/compression.xml b/pts/test-suites/compression.xml
index 883b4a0..37650b3 100644
--- a/pts/test-suites/compression.xml
+++ b/pts/test-suites/compression.xml
@@ -1,10 +1,10 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
-		<Title>Timed File Compression Tests</Title>
+		<Title>Timed File Compression</Title>
 		<Maintainer>Michael Larabel</Maintainer>
-		<Description>This test suite consists of tests that measure various forms of file compression such as gzip, bzip2, and 7zip. This suite is good for testing the system's processor, memory, and overall system performance.</Description>
+		<Description>This test suite consists of tests that measure various forms of file compression such as gzip, bzip2, and 7zip. The same 512MB original file is used in each test. This suite is good for testing the system's processor, memory, and overall system performance.</Description>
 	</SuiteInformation>
 	<RunTest>
 		<Test>compress-7zip</Test>
diff --git a/pts/test-suites/gaming-closed.xml b/pts/test-suites/gaming-closed.xml
new file mode 100644
index 0000000..6d4a4fc
--- /dev/null
+++ b/pts/test-suites/gaming-closed.xml
@@ -0,0 +1,14 @@
+<PhoronixTestSuite>
+	<SuiteInformation>
+		<Version>0.9.0</Version>
+		<TestType>System</TestType>
+		<Title>Closed-Source Gaming</Title>
+		<Maintainer>Michael Larabel</Maintainer>
+		<Description>The gaming test suite is made up of all game tests that are available for free download but are not under an open-source license, this does include free demos for retail games.</Description>
+	</SuiteInformation>
+	<RunTest>
+		<Test>etqw-demo</Test>
+		<Arguments>+set r_customWidth 1024 +set r_customHeight 768</Arguments>
+		<Description>1024 x 768</Description>
+	</RunTest>
+</PhoronixTestSuite>
diff --git a/pts/test-suites/gaming-free.xml b/pts/test-suites/gaming-free.xml
new file mode 100644
index 0000000..6b64383
--- /dev/null
+++ b/pts/test-suites/gaming-free.xml
@@ -0,0 +1,24 @@
+<PhoronixTestSuite>
+	<SuiteInformation>
+		<Version>0.9.0</Version>
+		<TestType>System</TestType>
+		<Title>Free Software Gaming</Title>
+		<Maintainer>Michael Larabel</Maintainer>
+		<Description>The gaming test suite is made up of all game tests that are open-source.</Description>
+	</SuiteInformation>
+	<RunTest>
+		<Test>nexuiz</Test>
+		<Arguments>+vid_width 1024 +vid_height 768</Arguments>
+		<Description>1024 x 768</Description>
+	</RunTest>
+	<RunTest>
+		<Test>warsow</Test>
+		<Arguments>+vid_customwidth 1024 +vid_customheight 768 +vid_restart</Arguments>
+		<Description>1024 x 768</Description>
+	</RunTest>
+	<RunTest>
+		<Test>openarena</Test>
+		<Arguments>+set r_customWidth 1024 +set r_customHeight 768</Arguments>
+		<Description>1024 x 768</Description>
+	</RunTest>
+</PhoronixTestSuite>
diff --git a/pts/test-suites/gaming.xml b/pts/test-suites/gaming.xml
new file mode 100644
index 0000000..bf8914e
--- /dev/null
+++ b/pts/test-suites/gaming.xml
@@ -0,0 +1,15 @@
+<PhoronixTestSuite>
+	<SuiteInformation>
+		<Version>0.9.0</Version>
+		<TestType>System</TestType>
+		<Title>Gaming</Title>
+		<Maintainer>Michael Larabel</Maintainer>
+		<Description>The gaming test suite is made up of all game tests -- both open-source and closed-source.</Description>
+	</SuiteInformation>
+	<RunTest>
+		<Test>gaming-free</Test>
+	</RunTest>
+	<RunTest>
+		<Test>gaming-closed</Test>
+	</RunTest>
+</PhoronixTestSuite>
diff --git a/pts/test-suites/graphics.xml b/pts/test-suites/graphics.xml
deleted file mode 100644
index cc0341b..0000000
--- a/pts/test-suites/graphics.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<PhoronixTestSuite>
-	<SuiteInformation>
-		<Version>0.5</Version>
-		<TestType>Graphics</TestType>
-		<Title>Phoronix Test Suite For Graphics</Title>
-		<Maintainer>Michael Larabel</Maintainer>
-		<Description>This test suite consists of benchmarks designed to test your graphics card and display driver.</Description>
-	</SuiteInformation>
-	<RunTest>
-		<Test>nexuiz</Test>
-		<Arguments>+vid_width 1024 +vid_height 768</Arguments>
-		<Description>1024 x 768</Description>
-	</RunTest>
-	<RunTest>
-		<Test>doom3</Test>
-		<Arguments>+set r_customWidth 1024 +set r_customHeight 768 +set com_machineSpec 2</Arguments>
-	</RunTest>
-</PhoronixTestSuite>
diff --git a/pts/test-suites/gui-toolkits.xml b/pts/test-suites/gui-toolkits.xml
index bf4278f..64990b4 100644
--- a/pts/test-suites/gui-toolkits.xml
+++ b/pts/test-suites/gui-toolkits.xml
@@ -1,10 +1,10 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.1</Version>
+		<Version>0.9.0</Version>
 		<TestType>Graphics</TestType>
 		<Title>GUI Toolkits</Title>
 		<Maintainer>Michael Larabel</Maintainer>
-		<Description>This test suite is made up of GUI tool-kit test profiles. Currently this suite consists of tests for just GTK.</Description>
+		<Description>This test suite is made up of GUI tool-kit test profiles. Currently this suite consists of tests for different GTK operations. This test suite is designed for testing your graphics card, processor (in some circumstances), and the graphics driver.</Description>
 	</SuiteInformation>
 	<RunTest>
 		<Test>gtkperf</Test>
diff --git a/pts/test-suites/java.xml b/pts/test-suites/java.xml
index 36495bb..bdcb29e 100644
--- a/pts/test-suites/java.xml
+++ b/pts/test-suites/java.xml
@@ -1,10 +1,10 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
-		<Title>Java Test Suite</Title>
+		<Title>Java</Title>
 		<Maintainer>Michael Larabel</Maintainer>
-		<Description>The Java test suite contains all working Java-based test profiles within the Phoronix Test Suite.</Description>
+		<Description>The Java test suite contains all Java-based test profiles within the Phoronix Test Suite.</Description>
 	</SuiteInformation>
 	<RunTest>
 		<Test>sunflow</Test>
diff --git a/pts/test-suites/molecular-dynamics.xml b/pts/test-suites/molecular-dynamics.xml
index 427b0d3..ef0b373 100644
--- a/pts/test-suites/molecular-dynamics.xml
+++ b/pts/test-suites/molecular-dynamics.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.1</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
 		<Title>Molecular Dynamics Test Suite</Title>
 		<Maintainer>Andrew Schofield</Maintainer>
diff --git a/pts/test-suites/multicore.xml b/pts/test-suites/multicore.xml
index b0db729..f944cd8 100644
--- a/pts/test-suites/multicore.xml
+++ b/pts/test-suites/multicore.xml
@@ -1,10 +1,10 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
-		<Title>Multi-Core Tests</Title>
+		<Title>Multi-Core</Title>
 		<Maintainer>Michael Larabel</Maintainer>
-		<Description>This test suite consists of tests that are able to take advantage of multi-core and/or multi-processor systems. This suite can be used on a single core system, however, it's intended for systems with multiple processing cores.</Description>
+		<Description>This test suite consists of tests that are able to take advantage of multi-core and/or multi-processor systems. This suite can be used on a single core system, however, it's intended for systems with multiple processing cores. Among the tests in this suite are encoding, compilation, and rendering tests.</Description>
 	</SuiteInformation>
 	<RunTest>
 		<Test>build-apache</Test>
diff --git a/pts/test-suites/pcqs-motherboard.xml b/pts/test-suites/pcqs-motherboard.xml
index e57d936..4ebc1d1 100644
--- a/pts/test-suites/pcqs-motherboard.xml
+++ b/pts/test-suites/pcqs-motherboard.xml
@@ -33,15 +33,12 @@
 	</RunTest>
 	<RunTest>
 		<Test>build-php</Test>
-		<Description>Time To Compile</Description>
 	</RunTest>
 	<RunTest>
 		<Test>build-apache</Test>
-		<Description>Time To Compile</Description>
 	</RunTest>
 	<RunTest>
 		<Test>compress-gzip</Test>
-		<Description>Compression Time</Description>
 	</RunTest>
 	<RunTest>
 		<Test>encode-mp3</Test>
diff --git a/pts/test-suites/pcqs-server-motherboard.xml b/pts/test-suites/pcqs-server-motherboard.xml
index 21dc063..5be4743 100644
--- a/pts/test-suites/pcqs-server-motherboard.xml
+++ b/pts/test-suites/pcqs-server-motherboard.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.6</Version>
+		<Version>0.9.0</Version>
 		<TestType>Motherboard</TestType>
 		<Title>PCQS: Server Motherboard</Title>
 		<Maintainer>Phoronix.com</Maintainer>
@@ -8,19 +8,15 @@
 	</SuiteInformation>
 	<RunTest>
 		<Test>build-imagemagick</Test>
-		<Description>Time To Compile</Description>
 	</RunTest>
 	<RunTest>
 		<Test>build-apache</Test>
-		<Description>Time To Compile</Description>
 	</RunTest>
 	<RunTest>
 		<Test>build-php</Test>
-		<Description>Time To Compile</Description>
 	</RunTest>
 	<RunTest>
 		<Test>compress-pbzip2</Test>
-		<Description>Compression Time</Description>
 	</RunTest>
 	<RunTest>
 		<Test>encode-mp3</Test>
@@ -31,6 +27,9 @@
 		<Description>Write Performance</Description>
 	</RunTest>
 	<RunTest>
+		<Test>gnupg</Test>
+	</RunTest>
+	<RunTest>
 		<Test>openssl</Test>
 	</RunTest>
 	<RunTest>
@@ -45,7 +44,6 @@
 	</RunTest>
 	<RunTest>
 		<Test>sunflow</Test>
-		<Description>Image Synthesis w/ Raytracing</Description>
 	</RunTest>
 	<RunTest>
 		<Test>specviewperf9</Test>
diff --git a/pts/test-suites/pcqs-workstation-graphics.xml b/pts/test-suites/pcqs-workstation-graphics.xml
index ce9a7d7..7e6c316 100644
--- a/pts/test-suites/pcqs-workstation-graphics.xml
+++ b/pts/test-suites/pcqs-workstation-graphics.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.1</Version>
+		<Version>0.9.0</Version>
 		<TestType>Graphics</TestType>
 		<Title>PCQS: Workstation Graphics</Title>
 		<Maintainer>Phoronix.com</Maintainer>
@@ -13,31 +13,41 @@
 	</RunTest>
 	<RunTest>
 		<Test>specviewperf9</Test>
+		<Arguments>maya</Arguments>
+		<Description>Maya</Description>
+	</RunTest>
+	<RunTest>
+		<Test>specviewperf9</Test>
+		<Arguments>light</Arguments>
+		<Description>Light</Description>
+	</RunTest>
+	<RunTest>
+		<Test>specviewperf10</Test>
 		<Arguments>catia</Arguments>
 		<Description>CATIA</Description>
 	</RunTest>
 	<RunTest>
-		<Test>specviewperf9</Test>
+		<Test>specviewperf10</Test>
 		<Arguments>ensight</Arguments>
 		<Description>EnSight</Description>
 	</RunTest>
 	<RunTest>
-		<Test>specviewperf9</Test>
+		<Test>specviewperf10</Test>
 		<Arguments>maya</Arguments>
 		<Description>Maya</Description>
 	</RunTest>
 	<RunTest>
-		<Test>specviewperf9</Test>
+		<Test>specviewperf10</Test>
 		<Arguments>proe</Arguments>
 		<Description>Pro/Engineer</Description>
 	</RunTest>
 	<RunTest>
-		<Test>specviewperf9</Test>
+		<Test>specviewperf10</Test>
 		<Arguments>sw</Arguments>
 		<Description>SolidWorks</Description>
 	</RunTest>
 	<RunTest>
-		<Test>specviewperf9</Test>
+		<Test>specviewperf10</Test>
 		<Arguments>ugnx</Arguments>
 		<Description>UGS NX</Description>
 	</RunTest>
diff --git a/pts/test-suites/system-memory.xml b/pts/test-suites/system-memory.xml
index fc5b14b..e95b48f 100644
--- a/pts/test-suites/system-memory.xml
+++ b/pts/test-suites/system-memory.xml
@@ -1,8 +1,8 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
-		<Title>System Memory Test Suite</Title>
+		<Title>System Memory</Title>
 		<Maintainer>Michael Larabel</Maintainer>
 		<Description>The system memory test suite consists of tests designed to test the computer's system memory (RAM) performance. Among these tests are RAMspeed and Bandwidth.</Description>
 	</SuiteInformation>
diff --git a/pts/test-suites/universe-cli.xml b/pts/test-suites/universe-cli.xml
index 94d97c1..4a0aff8 100644
--- a/pts/test-suites/universe-cli.xml
+++ b/pts/test-suites/universe-cli.xml
@@ -1,48 +1,50 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.6</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
 		<Title>Universe CLI Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
 		<Description>The Universe CLI suite contains Phoronix Test Suite tests that are all command-line based / don't require an X server to be running.</Description>
 	</SuiteInformation>
 	<RunTest>
-		<Test>encode-mp3</Test>
+		<Test>audio-encoding</Test>
 	</RunTest>
 	<RunTest>
-		<Test>encode-ogg</Test>
+		<Test>compilation</Test>
 	</RunTest>
 	<RunTest>
-		<Test>encode-flac</Test>
+		<Test>compression</Test>
 	</RunTest>
 	<RunTest>
-		<Test>build-mplayer</Test>
+		<Test>espeak</Test>
 	</RunTest>
 	<RunTest>
-		<Test>build-apache</Test>
+		<Test>iozone</Test>
+		<Arguments>-i0</Arguments>
+		<Description>Write Performance</Description>
 	</RunTest>
 	<RunTest>
-		<Test>build-php</Test>
+		<Test>gnupg</Test>
 	</RunTest>
 	<RunTest>
-		<Test>build-imagemagick</Test>
+		<Test>super-pi</Test>
 	</RunTest>
 	<RunTest>
-		<Test>compress-gzip</Test>
+		<Test>openssl</Test>
 	</RunTest>
 	<RunTest>
-		<Test>compress-7zip</Test>
+		<Test>sqlite</Test>
 	</RunTest>
 	<RunTest>
-		<Test>compress-pbzip2</Test>
+		<Test>pts-graph</Test>
 	</RunTest>
 	<RunTest>
-		<Test>iozone</Test>
-		<Arguments>-i0</Arguments>
-		<Description>Write Performance</Description>
+		<Test>tandem-xml</Test>
 	</RunTest>
 	<RunTest>
-		<Test>openssl</Test>
+		<Test>scimark2</Test>
+		<Arguments>COMPOSITE</Arguments>
+		<Description>Composite</Description>
 	</RunTest>
 	<RunTest>
 		<Test>ramspeed</Test>
diff --git a/pts/test-suites/universe-x.xml b/pts/test-suites/universe-x.xml
index 0d08b70..d03f0ed 100644
--- a/pts/test-suites/universe-x.xml
+++ b/pts/test-suites/universe-x.xml
@@ -1,20 +1,49 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.6</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
 		<Title>Universe Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
 		<Description>The Universe CLI suite contains Phoronix Test Suite tests that require an active X server / tests that are graphics-based.</Description>
 	</SuiteInformation>
 	<RunTest>
-		<Test>nexuiz</Test>
-		<Arguments>+vid_width 1024 +vid_height 768</Arguments>
-		<Description>1024 x 768</Description>
+		<Test>compliance-ogl</Test>
+	</RunTest>
+	<RunTest>
+		<Test>gui-toolkits</Test>
+	</RunTest>
+	<RunTest>
+		<Test>gaming</Test>
+	</RunTest>
+	<RunTest>
+		<Test>glmark</Test>
+		<Arguments>1024 768 VERTEX_ARRAY</Arguments>
+		<Description>1024 x 768 - Vertex Array</Description>
+	</RunTest>
+	<RunTest>
+		<Test>glmark</Test>
+		<Arguments>1024 768 GLSL_PER_PIXEL</Arguments>
+		<Description>1024 x 768 - GLSL Per Pixel Lighting</Description>
+	</RunTest>
+	<RunTest>
+		<Test>x11perf</Test>
+		<Arguments>-comppixwin500</Arguments>
+		<Description>500px Compositing From Pixmap To Window</Description>
 	</RunTest>
 	<RunTest>
 		<Test>norsetto-shadow</Test>
 	</RunTest>
 	<RunTest>
+		<Test>specviewperf9</Test>
+		<Arguments>3dsmax</Arguments>
+		<Description>3DS Max</Description>
+	</RunTest>
+	<RunTest>
+		<Test>specviewperf10</Test>
+		<Arguments>maya</Arguments>
+		<Description>Maya</Description>
+	</RunTest>
+	<RunTest>
 		<Test>xplane9</Test>
 		<Arguments>--fps_test=2 --pref:_x_res_req_ALL=1024 --pref:_y_res_req_ALL=768 --no_sound</Arguments>
 		<Description>High Quality - 1024 x 768</Description>
diff --git a/pts/test-suites/universe.xml b/pts/test-suites/universe.xml
index a4b9f1f..5cec64b 100644
--- a/pts/test-suites/universe.xml
+++ b/pts/test-suites/universe.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>0.6</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
 		<Title>Universe Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>