pts: Add adjustable file size support for bonnie test profile

6 files changed, 48 insertions, 27 deletions

diff --git a/pts/test-profiles/bonnie.xml b/pts/test-profiles/bonnie.xml
index 90f591f..c467b2d 100644
--- a/pts/test-profiles/bonnie.xml
+++ b/pts/test-profiles/bonnie.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.2.0</Version>
+		<Version>1.3.0</Version>
 		<TestType>Disk</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
@@ -50,6 +50,28 @@
 				</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/install.sh b/pts/test-resources/bonnie/install.sh
index fb6407b..7f85d8a 100755
--- a/pts/test-resources/bonnie/install.sh
+++ b/pts/test-resources/bonnie/install.sh
@@ -13,8 +13,7 @@ rm -rf bonnie++-1.03d/
 
 echo "#!/bin/sh
 echo \$1 > TEST_TYPE
-BONNIERAM=\$((\$SYS_MEMORY * 2))
 rm -rf scratch_dir/
 mkdir scratch_dir/
-./bonnie_/sbin/bonnie++ -d scratch_dir/ -s \$BONNIERAM > \$LOG_FILE 2>&1" > bonnie
+./bonnie_/sbin/bonnie++ -d scratch_dir/ -s \$2 > \$LOG_FILE 2>&1" > bonnie
 chmod +x bonnie
diff --git a/pts/test-suites/darwin.xml b/pts/test-suites/darwin.xml
index b527af8..f545889 100644
--- a/pts/test-suites/darwin.xml
+++ b/pts/test-suites/darwin.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>System</TestType>
 		<Title>Darwin Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
@@ -57,18 +57,18 @@
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE</Arguments>
-		<Description>Sequential Create</Description>
+		<Arguments>SEQ_CREATE 4096</Arguments>
+		<Description>4GB Sequential Create</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_READ</Arguments>
-		<Description>Random Read</Description>
+		<Arguments>RAND_READ 4096</Arguments>
+		<Description>4GB Random Read</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE</Arguments>
-		<Description>Random Delete</Description>
+		<Arguments>RAND_DELETE 4096</Arguments>
+		<Description>4GB Random Delete</Description>
 	</RunTest>
 	<RunTest>
 		<Test>gnupg</Test>
diff --git a/pts/test-suites/disk.xml b/pts/test-suites/disk.xml
index 0c34604..464e57d 100644
--- a/pts/test-suites/disk.xml
+++ b/pts/test-suites/disk.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.0.3</Version>
+		<Version>1.1.0</Version>
 		<TestType>Hard Disk</TestType>
 		<Title>Hard Disk Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
@@ -8,18 +8,18 @@
 	</SuiteInformation>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE</Arguments>
-		<Description>Sequential Create</Description>
+		<Arguments>SEQ_CREATE 4096</Arguments>
+		<Description>4GB Sequential Create</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_READ</Arguments>
-		<Description>Random Read</Description>
+		<Arguments>RAND_READ 4096</Arguments>
+		<Description>4GB Random Read</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE</Arguments>
-		<Description>Random Delete</Description>
+		<Arguments>RAND_DELETE 4096</Arguments>
+		<Description>4GB Random Delete</Description>
 	</RunTest>
 	<RunTest>
 		<Test>iozone</Test>
diff --git a/pts/test-suites/netbook.xml b/pts/test-suites/netbook.xml
index 3494120..8588ba0 100644
--- a/pts/test-suites/netbook.xml
+++ b/pts/test-suites/netbook.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>System</TestType>
 		<Title>Netbook Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
@@ -17,8 +17,8 @@
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_READ</Arguments>
-		<Description>Random Read</Description>
+		<Arguments>RAND_READ 4096</Arguments>
+		<Description>4GB Random Read</Description>
 	</RunTest>
 	<RunTest>
 		<Test>iozone</Test>
diff --git a/pts/test-suites/nevada.xml b/pts/test-suites/nevada.xml
index 81ef961..5baa0bb 100644
--- a/pts/test-suites/nevada.xml
+++ b/pts/test-suites/nevada.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<SuiteInformation>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>System</TestType>
 		<Title>OpenSolaris Nevada Test Suite</Title>
 		<Maintainer>Michael Larabel</Maintainer>
@@ -33,18 +33,18 @@
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>SEQ_CREATE</Arguments>
-		<Description>Sequential Create</Description>
+		<Arguments>SEQ_CREATE 4096</Arguments>
+		<Description>4GB Sequential Create</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_READ</Arguments>
-		<Description>Random Read</Description>
+		<Arguments>RAND_READ 4096</Arguments>
+		<Description>4GB Random Read</Description>
 	</RunTest>
 	<RunTest>
 		<Test>bonnie</Test>
-		<Arguments>RAND_DELETE</Arguments>
-		<Description>Random Delete</Description>
+		<Arguments>RAND_DELETE 4096</Arguments>
+		<Description>4GB Random Delete</Description>
 	</RunTest>
 	<RunTest>
 		<Test>gnupg</Test>