Quite a few test profile updates... a number of them getting close to

being finalized for 1.0 release of trondheim-pts.

17 files changed, 47 insertions, 29 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index 48fa45e..2320521 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -33,6 +33,7 @@ Phoronix Test Suite
 - Few minor improvements to PTS sensor monitoring
 - Enhanced merging support / appending "not-mergable" results at the end of file
 - Add force-install-all option for forcing the install of all available tests
+- Many test profile updates... a number of them getting close to being finalized for 1.0 release
 
 Phoronix Test Suite 0.7.0
 May 17, 2008
diff --git a/pts/test-profiles/md-gromacs.xml b/pts/test-profiles/md-gromacs.xml
index bc08eea..3bbfe82 100644
--- a/pts/test-profiles/md-gromacs.xml
+++ b/pts/test-profiles/md-gromacs.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.3</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
 		<SoftwareType>Scientific</SoftwareType>
 		<License>FREE</License>
@@ -11,11 +11,11 @@
 	</TestProfile>
 	<TestInformation>
 		<Title>GROMACS MD Benchmark</Title>
-		<SubTitle></SubTitle>
+		<SubTitle>Molecular Dynamics</SubTitle>
 		<Version>3.3.3</Version>
 		<TimesToRun>3</TimesToRun>
 		<Executable>gromacs</Executable>
-		<ResultScale>GFLOPS</ResultScale>
+		<ResultScale>Gflops</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test runs a series of molecular dynamics simulations using the GROMACS MD package. This test is capable of running on multiple cores by using the MPICH2 library, and is similar in configuration to the SMP GROMACS cores (FahCore_a1) used by the Folding@HOME distributed computing project.</Description>
 		<ExternalDependencies>build-utilities, fortran-compiler</ExternalDependencies>
diff --git a/pts/test-profiles/memory-bandwidth.xml b/pts/test-profiles/memory-bandwidth.xml
index 13d28b8..24ce61e 100644
--- a/pts/test-profiles/memory-bandwidth.xml
+++ b/pts/test-profiles/memory-bandwidth.xml
@@ -1,11 +1,13 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.5</Version>
+		<Version>0.9.0</Version>
 		<TestType>Memory</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
+		<DownloadSize>1</DownloadSize>
+		<EnvironmentSize>1</EnvironmentSize>
 	</TestProfile>
 	<TestInformation>
 		<Title>Bandwidth</Title>
diff --git a/pts/test-profiles/nexuiz.xml b/pts/test-profiles/nexuiz.xml
index 9434da5..c46b5e8 100644
--- a/pts/test-profiles/nexuiz.xml
+++ b/pts/test-profiles/nexuiz.xml
@@ -1,11 +1,13 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.4</Version>
+		<Version>0.9.0</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
+		<DownloadSize>363</DownloadSize>
+		<EnvironmentSize>382</EnvironmentSize>
 	</TestProfile>
 	<TestInformation>
 		<Title>Nexuiz</Title>
@@ -13,7 +15,7 @@
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Average FPS</ResultScale>
 		<Proportion>HIB</Proportion>
-		<Description>This is a benchmark of Nexuiz, a popular open-source first-person shooter.</Description>
+		<Description>This is a benchmark of Nexuiz, a popular open-source first-person shooter. Thi sgame uses the DarkPlaces engine, which is a largely modified version of the Quake engine with extra features such as High Dynamic Range rendering and OpenGL 2.0 shaders.</Description>
 	</TestInformation>
 	<TestSettings>
 		<Default>
diff --git a/pts/test-profiles/norsetto-shadow.xml b/pts/test-profiles/norsetto-shadow.xml
index 08044a8..3891ee5 100644
--- a/pts/test-profiles/norsetto-shadow.xml
+++ b/pts/test-profiles/norsetto-shadow.xml
@@ -1,19 +1,20 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.3</Version>
+		<Version>0.9.0</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
+		<DownloadSize>1</DownloadSize>
+		<EnvironmentSize>3</EnvironmentSize>
 	</TestProfile>
 	<TestInformation>
 		<Title>Norsetto Shadow</Title>
-		<Version></Version>
 		<TimesToRun>2</TimesToRun>
 		<ResultScale>Average FPS</ResultScale>
 		<Proportion>HIB</Proportion>
-		<Description>This is a benchmark of Norsetto Shadow.</Description>
+		<Description>This is a test of Norsetto Shadow, which is a basic OpenGL demo.</Description>
 		<ExternalDependencies>build-utilities, glut</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/openarena.xml b/pts/test-profiles/openarena.xml
index dbed786..e434bab 100644
--- a/pts/test-profiles/openarena.xml
+++ b/pts/test-profiles/openarena.xml
@@ -1,19 +1,21 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.4</Version>
+		<Version>0.9.0</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
+		<DownloadSize>272</DownloadSize>
+		<EnvironmentSize>279</EnvironmentSize>
 	</TestProfile>
 	<TestInformation>
 		<Title>OpenArena</Title>
 		<Version>0.7.6</Version>
-		<TimesToRun>3</TimesToRun>
+		<TimesToRun>1</TimesToRun>
 		<ResultScale>Average FPS</ResultScale>
 		<Proportion>HIB</Proportion>
-		<Description>This is a benchmark of OpenArena, a popular open-source first-person shooter.</Description>
+		<Description>This is a test of OpenArena, a popular open-source first-person shooter. This game is based upon ioquake3, which in turn uses the GPL version of id Software's Quake 3 engine.</Description>
 	</TestInformation>
 	<TestSettings>
 		<Default>
@@ -40,6 +42,10 @@
 					<Name>1680 x 1050</Name>
 					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
 				</Entry>
+				<Entry>
+					<Name>1680 x 1050</Name>
+					<Value>+set r_customWidth 1600 +set r_customHeight 1200</Value>
+				</Entry>
 			</Menu>
 		</Option>
 	</TestSettings>
diff --git a/pts/test-profiles/openssl.xml b/pts/test-profiles/openssl.xml
index a144aab..e0f8580 100644
--- a/pts/test-profiles/openssl.xml
+++ b/pts/test-profiles/openssl.xml
@@ -1,11 +1,13 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.6</Version>
+		<Version>0.9.0</Version>
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
+		<DownloadSize>3</DownloadSize>
+		<EnvironmentSize>37</EnvironmentSize>
 	</TestProfile>
 	<TestInformation>
 		<Title>OpenSSL</Title>
@@ -14,7 +16,7 @@
 		<TimesToRun>4</TimesToRun>
 		<ResultScale>Signs Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
-		<Description>This is a benchmark of OpenSSL, the open-source toolkit for SSL/TLS.</Description>
+		<Description>OpenSSL is an open-source toolkit that implements SSL (Secure Sockets Layer) and TLS (Transport Layer Security) protocols. This test measures the RSA 4096-bit performance of OpenSSL.</Description>
 		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/pts-graph.xml b/pts/test-profiles/pts-graph.xml
index 770d982..5f66cec 100644
--- a/pts/test-profiles/pts-graph.xml
+++ b/pts/test-profiles/pts-graph.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>0.1</Version>
+		<Version>0.9.0</Version>
 		<TestType>System</TestType>
 		<SoftwareType>Benchmark</SoftwareType>
 		<License>FREE</License>
@@ -9,10 +9,11 @@
 	</TestProfile>
 	<TestInformation>
 		<Title>PTS Grapher</Title>
-		<Version>1</Version>
+		<Version>1.00</Version>
+		<SubTitle>PHP + GD Library PNG Rendering</SubTitle>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
-		<Description>This is a simple benchmark of pts_Graph, pts_LineGraph, and pts_BarGraph, which are graphing libraries written for the Phoronix Test Suite that use PHP and the GD graphics library.</Description>
+		<Description>This is a simple benchmark of pts_Graph, pts_LineGraph, and pts_BarGraph, which are graphing libraries written for the Phoronix Test Suite that use PHP and the GD graphics library. This test will time how long it takes to generate 5,000 graphs.</Description>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/nexuiz/downloads.xml b/pts/test-resources/nexuiz/downloads.xml
index e2045a9..e225854 100644
--- a/pts/test-resources/nexuiz/downloads.xml
+++ b/pts/test-resources/nexuiz/downloads.xml
@@ -1,7 +1,7 @@
 <PhoronixTestSuite>
 	<Downloads>
 		<Package>
-			<URL>http://superb-west.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip, http://internap.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip</URL>
+			<URL>http://superb-west.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip, http://internap.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip, http://garr.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip, http://superb-east.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-242.zip</URL>
 			<MD5>2ea51368774ca603fd56faebfeac74d7</MD5>
 		</Package>
 	</Downloads>
diff --git a/pts/test-resources/openarena/downloads.xml b/pts/test-resources/openarena/downloads.xml
index 6deded0..cf1e777 100644
--- a/pts/test-resources/openarena/downloads.xml
+++ b/pts/test-resources/openarena/downloads.xml
@@ -1,12 +1,12 @@
 <PhoronixTestSuite>
 	<Downloads>
 		<Package>
-			<URL>http://download.tuxfamily.org/openarena/rel/076/oa076.zip</URL>
+			<URL>http://download.tuxfamily.org/openarena/rel/076/oa076.zip, http://mix.maustsontoast.com/oa076.zip</URL>
 			<MD5>9feb2124b9ac8c46ff11163fd5bb1049</MD5>
 		</Package>
 		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/openarena-benchmark-files-1.tar.gz</URL>
-			<MD5>ca7ed3d05e040f08f8b1c7ee931ef102</MD5>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/openarena-benchmark-files-2.tar.gz</URL>
+			<MD5>47bafb6c862cc83431ee9599cf8e5bc1</MD5>
 		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/openarena/install.sh b/pts/test-resources/openarena/install.sh
index 1c3c045..e1af49f 100755
--- a/pts/test-resources/openarena/install.sh
+++ b/pts/test-resources/openarena/install.sh
@@ -3,13 +3,13 @@
 cd $1
 unzip -o oa076.zip
 cd openarena-0.7.6/baseoa
-tar -xvf ../../openarena-benchmark-files-1.tar.gz
+tar -xvf ../../openarena-benchmark-files-2.tar.gz
 cd ../..
 
 echo "#!/bin/sh
 cd openarena-0.7.6/
 
-case `uname -m` in
+case \$OS_ARCH in
 	\"x86_64\" )
 	./openarena.x86_64 \$@ 2>&1 | grep fps
 	;;
diff --git a/pts/test-resources/openssl/downloads.xml b/pts/test-resources/openssl/downloads.xml
index d06c641..a39565f 100644
--- a/pts/test-resources/openssl/downloads.xml
+++ b/pts/test-resources/openssl/downloads.xml
@@ -1,7 +1,7 @@
 <PhoronixTestSuite>
 	<Downloads>
 		<Package>
-			<URL>ftp://ftp.openssl.org/source/openssl-0.9.8g.tar.gz</URL>
+			<URL>ftp://ftp.openssl.org/source/openssl-0.9.8g.tar.gz, http://ftp.uoi.gr/pub/security/OpenSSL/source/openssl-0.9.8g.tar.gz, http://ftp.osuosl.org/pub/blfs/6.3/o/openssl-0.9.8g.tar.gz</URL>
 			<MD5>acf70a16359bf3658bdfb74bda1c4419</MD5>
 		</Package>
 	</Downloads>
diff --git a/pts/test-resources/openssl/parse-results.php b/pts/test-resources/openssl/parse-results.php
index a3a406d..aff022f 100644
--- a/pts/test-resources/openssl/parse-results.php
+++ b/pts/test-resources/openssl/parse-results.php
@@ -19,4 +19,5 @@ foreach(explode(" ", $BENCHMARK_RESULTS) as $item)
 }
 
 echo $BENCHMARK_RESULTS;
+
 ?>
diff --git a/pts/test-resources/pts-graph/downloads.xml b/pts/test-resources/pts-graph/downloads.xml
index 7068c48..d79f74c 100644
--- a/pts/test-resources/pts-graph/downloads.xml
+++ b/pts/test-resources/pts-graph/downloads.xml
@@ -1,8 +1,8 @@
 <PhoronixTestSuite>
 	<Downloads>
 		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-graph-benchmark.tar.gz</URL>
-			<MD5>99a78ecc6086b41ce97e123564091a03</MD5>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-graph-benchmark-1.tar.gz</URL>
+			<MD5>c915f2c3601d476dc52c018356c1311b</MD5>
 		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/pts-graph/install.sh b/pts/test-resources/pts-graph/install.sh
index 75e65ef..3fe5684 100644
--- a/pts/test-resources/pts-graph/install.sh
+++ b/pts/test-resources/pts-graph/install.sh
@@ -2,7 +2,7 @@
 
 cd $1
 
-tar -xvf pts-graph-benchmark.tar.gz
+tar -xvf pts-graph-benchmark-1.tar.gz
 
 echo "#!/bin/sh
 
diff --git a/pts/test-resources/specviewperf9/downloads.xml b/pts/test-resources/specviewperf9/downloads.xml
index 85b660d..56f420b 100644
--- a/pts/test-resources/specviewperf9/downloads.xml
+++ b/pts/test-resources/specviewperf9/downloads.xml
@@ -5,8 +5,8 @@
 			<MD5>1651c5c99cbc724bfdbb6cf70220502d</MD5>
 		</Package>
 		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/SPECViewPerf9-Configure</URL>
-			<MD5>e01d9e4d7c9245b537ecea327852b8d2</MD5>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/SPECViewPerf9-Configure.tar.gz</URL>
+			<MD5>de9fd4881ebd5d42a5067e9c7b51ec1a</MD5>
 		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/specviewperf9/install.sh b/pts/test-resources/specviewperf9/install.sh
index 2e7f4c0..365d37d 100644
--- a/pts/test-resources/specviewperf9/install.sh
+++ b/pts/test-resources/specviewperf9/install.sh
@@ -2,7 +2,9 @@
 
 cd $1
 
+tar -xvf SPECViewPerf10-Configure.tar.gz
 tar -xvf SPECViewperf9.0.3.tar.gz
+
 cp -f SPECViewPerf9-Configure SPECViewperf9.0/src/Configure
 chmod +x SPECViewperf9.0/src/Configure
 cd SPECViewperf9.0/src