pts: Switch relevant test profiles over to using auto-resolution

Test away! Should be fine though. Now Doom3, ET, ETQW Demo, ETQW GLMark,
Lightsmark, OpenArena, Quake 4, Tremulous, Urban Terror, Warsow, and
XPlane will detect available resolutions at run-time.

12 files changed, 48 insertions, 270 deletions

diff --git a/pts/test-profiles/doom3.xml b/pts/test-profiles/doom3.xml
index 1d29ad7..4324cd1 100644
--- a/pts/test-profiles/doom3.xml
+++ b/pts/test-profiles/doom3.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>NON-FREE</License>
@@ -24,27 +24,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customWidth 800 +set r_customHeight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customWidth 1920 +set r_customHeight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customWidth $VIDEO_WIDTH +set r_customHeight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/et.xml b/pts/test-profiles/et.xml
index f770fbf..8e7476f 100644
--- a/pts/test-profiles/et.xml
+++ b/pts/test-profiles/et.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
@@ -25,31 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customwidth 800 +set r_customheight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customwidth 1024 +set r_customheight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customwidth 1280 +set r_customheight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customwidth 1680 +set r_customheight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+set r_customwidth 1600 +set r_customheight 1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customwidth 1920 +set r_customheight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customwidth $VIDEO_WIDTH +set r_customheight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/etqw-demo.xml b/pts/test-profiles/etqw-demo.xml
index a8a8f0e..e4f8faf 100644
--- a/pts/test-profiles/etqw-demo.xml
+++ b/pts/test-profiles/etqw-demo.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>NON-FREE</License>
@@ -27,27 +27,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customWidth 800 +set r_customHeight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customWidth 1920 +set r_customHeight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customWidth $VIDEO_WIDTH +set r_customHeight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/etqw.xml b/pts/test-profiles/etqw.xml
index 99bd0c6..6b76fd5 100644
--- a/pts/test-profiles/etqw.xml
+++ b/pts/test-profiles/etqw.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>NON-FREE</License>
@@ -25,27 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customWidth 800 +set r_customHeight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customWidth 1920 +set r_customHeight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customWidth $VIDEO_WIDTH +set r_customHeight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/glmark.xml b/pts/test-profiles/glmark.xml
index 6876840..55e3f88 100644
--- a/pts/test-profiles/glmark.xml
+++ b/pts/test-profiles/glmark.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<TestType>Graphics</TestType>
 		<ApplicationType>Utility</ApplicationType>
 		<License>FREE</License>
@@ -22,31 +22,11 @@
 	<TestSettings>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>800 600 24 0</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>1024 768 24 0</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>1280 1024 24 0</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>1680 1050 24 0</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>1600 1200 24 0</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>1920 1200 24 0</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>$VIDEO_WIDTH $VIDEO_HEIGHT 24 0</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/lightsmark.xml b/pts/test-profiles/lightsmark.xml
index 6dee216..a82378b 100644
--- a/pts/test-profiles/lightsmark.xml
+++ b/pts/test-profiles/lightsmark.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.1.0</Version>
+		<Version>1.1.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>NON-FREE</License>
@@ -23,27 +23,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>800x600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>1024x768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>1280x1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>1680x1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>1920x1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>$VIDEO_WIDTHx$VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/openarena.xml b/pts/test-profiles/openarena.xml
index 39864ac..887970f 100644
--- a/pts/test-profiles/openarena.xml
+++ b/pts/test-profiles/openarena.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
@@ -25,32 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
-			<ArgumentName></ArgumentName>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customWidth 800 +set r_customHeight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+set r_customWidth 1600 +set r_customHeight 1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customWidth 1920 +set r_customHeight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customWidth $VIDEO_WIDTH +set r_customHeight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/quake4.xml b/pts/test-profiles/quake4.xml
index 8a8cf49..2298436 100644
--- a/pts/test-profiles/quake4.xml
+++ b/pts/test-profiles/quake4.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>NON-FREE</License>
@@ -25,31 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customWidth 800 +set r_customHeight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+set r_customWidth 1600 +set r_customHeight 1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customWidth 1920 +set r_customHeight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customWidth $VIDEO_WIDTH +set r_customHeight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/tremulous.xml b/pts/test-profiles/tremulous.xml
index c7e6f62..214ac59 100644
--- a/pts/test-profiles/tremulous.xml
+++ b/pts/test-profiles/tremulous.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
@@ -25,31 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customwidth 800 +set r_customheight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customwidth 1024 +set r_customheight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customwidth 1280 +set r_customheight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customwidth 1680 +set r_customheight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+set r_customwidth 1600 +set r_customheight 1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customwidth 1920 +set r_customheight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customwidth $VIDEO_WIDTH +set r_customheight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/urbanterror.xml b/pts/test-profiles/urbanterror.xml
index 291a273..c7bf2ec 100644
--- a/pts/test-profiles/urbanterror.xml
+++ b/pts/test-profiles/urbanterror.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Game</SoftwareType>
 		<License>FREE</License>
@@ -25,31 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+set r_customwidth 800 +set r_customheight 600</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+set r_customwidth 1024 +set r_customheight 768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+set r_customwidth 1280 +set r_customheight 1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+set r_customwidth 1680 +set r_customheight 1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+set r_customwidth 1600 +set r_customheight 1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+set r_customwidth 1920 +set r_customheight 1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+set r_customwidth $VIDEO_WIDTH +set r_customheight $VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/warsow.xml b/pts/test-profiles/warsow.xml
index 5c9012e..9178904 100644
--- a/pts/test-profiles/warsow.xml
+++ b/pts/test-profiles/warsow.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<TestType>Graphics</TestType>
 		<ApplicationType>Game</ApplicationType>
 		<License>FREE</License>
@@ -25,32 +25,11 @@
 		</Default>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>resolution</Identifier>
-			<ArgumentName></ArgumentName>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>800 x 600</Name>
-					<Value>+vid_customwidth 800 +vid_customheight 600 +vid_restart</Value>
-				</Entry>
-				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>+vid_customwidth 1024 +vid_customheight 768 +vid_restart</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>+vid_customwidth 1280 +vid_customheight 1024 +vid_restart</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>+vid_customwidth 1600 +vid_customheight 1200 +vid_restart</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>+vid_customwidth 1680 +vid_customheight 1050 +vid_restart</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>+vid_customwidth 1920 +vid_customheight 1200 +vid_restart</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>+vid_customwidth $VIDEO_WIDTH +vid_customheight $VIDEO_HEIGHT +vid_restart</Value>
 				</Entry>
 			</Menu>
 		</Option>
diff --git a/pts/test-profiles/xplane9.xml b/pts/test-profiles/xplane9.xml
index 83ba563..6024897 100644
--- a/pts/test-profiles/xplane9.xml
+++ b/pts/test-profiles/xplane9.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Simulator</SoftwareType>
 		<License>FREE</License>
@@ -41,27 +41,11 @@
 		</Option>
 		<Option>
 			<DisplayName>Resolution</DisplayName>
-			<Identifier>display-resolution</Identifier>
+			<Identifier>auto-resolution</Identifier>
 			<Menu>
 				<Entry>
-					<Name>1024 x 768</Name>
-					<Value>--pref:_x_res_req_ALL=1024 --pref:_y_res_req_ALL=768</Value>
-				</Entry>
-				<Entry>
-					<Name>1280 x 1024</Name>
-					<Value>--pref:_x_res_req_ALL=1280 --pref:_y_res_req_ALL=1024</Value>
-				</Entry>
-				<Entry>
-					<Name>1680 x 1050</Name>
-					<Value>--pref:_x_res_req_ALL=1680 --pref:_y_res_req_ALL=1050</Value>
-				</Entry>
-				<Entry>
-					<Name>1600 x 1200</Name>
-					<Value>--pref:_x_res_req_ALL=1600 --pref:_y_res_req_ALL=1200</Value>
-				</Entry>
-				<Entry>
-					<Name>1920 x 1200</Name>
-					<Value>--pref:_x_res_req_ALL=1920 --pref:_y_res_req_ALL=1200</Value>
+					<Name>$VIDEO_WIDTH x $VIDEO_HEIGHT</Name>
+					<Value>--pref:_x_res_req_ALL=$VIDEO_WIDTH --pref:_y_res_req_ALL=$VIDEO_HEIGHT</Value>
 				</Entry>
 			</Menu>
 		</Option>