pts: Remove bonnie until new revisions are made

8 files changed, 7 insertions, 189 deletions

diff --git a/pts/test-profiles/bonnie.xml b/pts/test-profiles/bonnie.xml
deleted file mode 100644
index d14a8db..0000000
--- a/pts/test-profiles/bonnie.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<PhoronixTestSuite>
-	<TestProfile>
-		<Version>1.3.0</Version>
-		<TestType>Disk</TestType>
-		<SoftwareType>Utility</SoftwareType>
-		<License>FREE</License>
-		<Status>VERIFIED</Status>
-		<Maintainer>Michael Larabel</Maintainer>
-		<EnvironmentSize>0.1</EnvironmentSize>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
-		<ProjectURL>http://www.coker.com.au/bonnie++/</ProjectURL>
-	</TestProfile>
-	<TestInformation>
-		<Title>Bonnie++</Title>
-		<Version>1.03d</Version>
-		<TimesToRun>1</TimesToRun>
-		<ResultScale>Operations / Second</ResultScale>
-		<Proportion>HIB</Proportion>
-		<TimesToRun>1</TimesToRun>
-		<Description>This benchmark tests the system's hard disk.</Description>
-	</TestInformation>
-	<TestSettings>
-		<Option>
-			<DisplayName>Type</DisplayName>
-			<Identifier>run-type</Identifier>
-			<Menu>
-				<Entry>
-					<Name>Sequential Create</Name>
-					<Value>SEQ_CREATE</Value>
-				</Entry>
-				<Entry>
-					<Name>Sequential Read</Name>
-					<Value>SEQ_READ</Value>
-				</Entry>
-				<Entry>
-					<Name>Sequential Delete</Name>
-					<Value>SEQ_DELETE</Value>
-				</Entry>
-				<Entry>
-					<Name>Random Create</Name>
-					<Value>RAND_CREATE</Value>
-				</Entry>
-				<Entry>
-					<Name>Random Read</Name>
-					<Value>RAND_READ</Value>
-				</Entry>
-				<Entry>
-					<Name>Random Delete</Name>
-					<Value>RAND_DELETE</Value>
-				</Entry>
-			</Menu>
-		</Option>
-		<Option>
-			<DisplayName>Size</DisplayName>
-			<Identifier>size</Identifier>
-			<Menu>
-				<Entry>
-					<Name>512MB</Name>
-					<Value>512</Value>
-				</Entry>
-				<Entry>
-					<Name>2GB</Name>
-					<Value>2048</Value>
-				</Entry>
-				<Entry>
-					<Name>4GB</Name>
-					<Value>4096</Value>
-				</Entry>
-				<Entry>
-					<Name>8GB</Name>
-					<Value>8192</Value>
-				</Entry>
-			</Menu>
-		</Option>
-	</TestSettings>
-</PhoronixTestSuite>
diff --git a/pts/test-resources/bonnie/downloads.xml b/pts/test-resources/bonnie/downloads.xml
deleted file mode 100644
index d68f74b..0000000
--- a/pts/test-resources/bonnie/downloads.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<PhoronixTestSuite>
-	<Downloads>
-		<Package>
-			<URL>http://www.coker.com.au/bonnie++/bonnie++-1.03d.tgz</URL>
-			<MD5>3bdccb241cb7ab53e8efa3a3a55bc4ce</MD5>
-			<FileSize>79666</FileSize>
-		</Package>
-	</Downloads>
-</PhoronixTestSuite>
diff --git a/pts/test-resources/bonnie/install.sh b/pts/test-resources/bonnie/install.sh
deleted file mode 100755
index 7f85d8a..0000000
--- a/pts/test-resources/bonnie/install.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-THIS_DIR=$(pwd)
-mkdir $THIS_DIR/bonnie_
-
-tar -xvf bonnie++-1.03d.tgz
-cd bonnie++-1.03d/
-./configure --prefix=$THIS_DIR/bonnie_
-make -j $NUM_CPU_JOBS
-make install
-cd ..
-rm -rf bonnie++-1.03d/
-
-echo "#!/bin/sh
-echo \$1 > TEST_TYPE
-rm -rf scratch_dir/
-mkdir scratch_dir/
-./bonnie_/sbin/bonnie++ -d scratch_dir/ -s \$2 > \$LOG_FILE 2>&1" > bonnie
-chmod +x bonnie
diff --git a/pts/test-resources/bonnie/parse-results.php b/pts/test-resources/bonnie/parse-results.php
deleted file mode 100644
index 00bd19d..0000000
--- a/pts/test-resources/bonnie/parse-results.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$results = trim(file_get_contents(getenv("LOG_FILE")));
-$BENCHMARK_RESULTS = trim(substr($results, strrpos($results, "\n") + 1));
-
-$test_parts = explode(",", $BENCHMARK_RESULTS);
-$test_target = trim(@file_get_contents("TEST_TYPE"));
-
-$BENCHMARK_RESULTS = "";
-switch($test_target)
-{
-	case "SEQ_CREATE":
-		$BENCHMARK_RESULTS = $test_parts[2];
-		break;
-	case "SEQ_READ":
-		$BENCHMARK_RESULTS = $test_parts[4];
-		break;
-	case "SEQ_DELETE":
-		$BENCHMARK_RESULTS = $test_parts[6];
-		break;
-	case "RAND_CREATE":
-		$BENCHMARK_RESULTS = $test_parts[8];
-		break;
-	case "RAND_READ":
-		$BENCHMARK_RESULTS = $test_parts[10];
-		break;
-	case "RAND_DELETE":
-		$BENCHMARK_RESULTS = $test_parts[12];
-		break;
-}
-
-echo $BENCHMARK_RESULTS;
-?>
diff --git a/pts/test-suites/darwin.xml b/pts/test-suites/darwin.xml
index f545889..d81be89 100644
--- a/pts/test-suites/darwin.xml
+++ b/pts/test-suites/darwin.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.1.0</Version>
+		<Version>1.1.1</Version>
 		<TestType>System</TestType>
 		<Title>Darwin Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
@@ -56,21 +56,6 @@
 		<Test>compress-gzip</Test>
 	</RunTest>
 	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE 4096</Arguments>
-		<Description>4GB Sequential Create</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_READ 4096</Arguments>
-		<Description>4GB Random Read</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE 4096</Arguments>
-		<Description>4GB Random Delete</Description>
-	</RunTest>
-	<RunTest>
 		<Test>gnupg</Test>
 	</RunTest>
 	<RunTest>
diff --git a/pts/test-suites/disk.xml b/pts/test-suites/disk.xml
index 7df3da5..e6aa9e8 100644
--- a/pts/test-suites/disk.xml
+++ b/pts/test-suites/disk.xml
@@ -1,32 +1,22 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.1.0</Version>
+		<Version>1.1.1</Version>
 		<TestType>Hard Disk</TestType>
 		<Title>Hard Disk Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
 		<Description>The disk suite contains Phoronix Test Suite tests designed to test the system's disk (HDD) performance.</Description>
 	</SuiteInformation>
 	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE 4096</Arguments>
-		<Description>4GB Sequential Create</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_READ 4096</Arguments>
-		<Description>4GB Random Read</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE 4096</Arguments>
-		<Description>4GB Random Delete</Description>
-	</RunTest>
-	<RunTest>
 		<Test>iozone</Test>
 		<Arguments>-s 4096M -i0</Arguments>
 		<Description>4GB Write Performance</Description>
 	</RunTest>
 	<RunTest>
+		<Test>iozone</Test>
+		<Arguments>-s 4096M -i0 -i1</Arguments>
+		<Description>4GB Read Performance</Description>
+	</RunTest>
+	<RunTest>
 		<Test>fio</Test>
 		<Arguments>examples/iometer-file-access-server</Arguments>
 		<Description>Intel IOMeter File Server Access Pattern</Description>
diff --git a/pts/test-suites/netbook.xml b/pts/test-suites/netbook.xml
index 95afd2a..19647c4 100644
--- a/pts/test-suites/netbook.xml
+++ b/pts/test-suites/netbook.xml
@@ -16,11 +16,6 @@
 		<Test>compress-gzip</Test>
 	</RunTest>
 	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_READ 4096</Arguments>
-		<Description>4GB Random Read</Description>
-	</RunTest>
-	<RunTest>
 		<Test>iozone</Test>
 		<Arguments>-s 512M -i0</Arguments>
 		<Description>512MB Write Performance</Description>
diff --git a/pts/test-suites/nevada.xml b/pts/test-suites/nevada.xml
index 5baa0bb..ebc0fb0 100644
--- a/pts/test-suites/nevada.xml
+++ b/pts/test-suites/nevada.xml
@@ -32,21 +32,6 @@
 		<Test>compress-gzip</Test>
 	</RunTest>
 	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE 4096</Arguments>
-		<Description>4GB Sequential Create</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_READ 4096</Arguments>
-		<Description>4GB Random Read</Description>
-	</RunTest>
-	<RunTest>
-		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE 4096</Arguments>
-		<Description>4GB Random Delete</Description>
-	</RunTest>
-	<RunTest>
 		<Test>gnupg</Test>
 	</RunTest>
 	<RunTest>