Add --deqp-watchdog=enable to mustpass spec files

Android CTS now uses deqp built-in watchdog for recovery. This CL
updates mustpass spec files accordingly.

Change-Id: I0359fb8bddff4010804fddea09c0413b235113a7
diff --git a/android/cts/lmp-mr1/mustpass.xml b/android/cts/lmp-mr1/mustpass.xml
index a521835..bae28d3 100644
--- a/android/cts/lmp-mr1/mustpass.xml
+++ b/android/cts/lmp-mr1/mustpass.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Mustpass version="lmp-mr1">
 	<TestPackage name="dEQP-GLES3">
-		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 	<TestPackage name="dEQP-GLES31">
-		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 </Mustpass>
diff --git a/android/cts/lmp/mustpass.xml b/android/cts/lmp/mustpass.xml
index 1f58f82..abc191f 100644
--- a/android/cts/lmp/mustpass.xml
+++ b/android/cts/lmp/mustpass.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Mustpass version="lmp">
 	<TestPackage name="dEQP-GLES3">
-		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 	<TestPackage name="dEQP-GLES31">
-		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 </Mustpass>
diff --git a/android/cts/master/mustpass.xml b/android/cts/master/mustpass.xml
index 4a4dfc9..f8c924a 100644
--- a/android/cts/master/mustpass.xml
+++ b/android/cts/master/mustpass.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Mustpass version="master">
 	<TestPackage name="dEQP-EGL">
-		<Configuration caseListFile="egl-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="egl-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 	<TestPackage name="dEQP-GLES2">
-		<Configuration caseListFile="gles2-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
+		<Configuration caseListFile="gles2-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
 	</TestPackage>
 	<TestPackage name="dEQP-GLES3">
-		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
-		<Configuration caseListFile="gles3-rotate-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=0 --deqp-surface-type=window" name="rotate-portrait"/>
-		<Configuration caseListFile="gles3-rotate-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=90 --deqp-surface-type=window" name="rotate-landscape"/>
-		<Configuration caseListFile="gles3-rotate-reverse-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=180 --deqp-surface-type=window" name="rotate-reverse-portrait"/>
-		<Configuration caseListFile="gles3-rotate-reverse-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=270 --deqp-surface-type=window" name="rotate-reverse-landscape"/>
-		<Configuration caseListFile="gles3-multisample.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms4 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="multisample"/>
-		<Configuration caseListFile="gles3-565-no-depth-no-stencil.txt" commandLine="--deqp-gl-config-name=rgb565d0s0ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="565-no-depth-no-stencil"/>
+		<Configuration caseListFile="gles3-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
+		<Configuration caseListFile="gles3-rotate-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=0 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-portrait"/>
+		<Configuration caseListFile="gles3-rotate-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=90 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-landscape"/>
+		<Configuration caseListFile="gles3-rotate-reverse-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=180 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-reverse-portrait"/>
+		<Configuration caseListFile="gles3-rotate-reverse-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=270 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-reverse-landscape"/>
+		<Configuration caseListFile="gles3-multisample.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms4 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="multisample"/>
+		<Configuration caseListFile="gles3-565-no-depth-no-stencil.txt" commandLine="--deqp-gl-config-name=rgb565d0s0ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="565-no-depth-no-stencil"/>
 	</TestPackage>
 	<TestPackage name="dEQP-GLES31">
-		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="master"/>
-		<Configuration caseListFile="gles31-rotate-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=0 --deqp-surface-type=window" name="rotate-portrait"/>
-		<Configuration caseListFile="gles31-rotate-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=90 --deqp-surface-type=window" name="rotate-landscape"/>
-		<Configuration caseListFile="gles31-rotate-reverse-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=180 --deqp-surface-type=window" name="rotate-reverse-portrait"/>
-		<Configuration caseListFile="gles31-rotate-reverse-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=270 --deqp-surface-type=window" name="rotate-reverse-landscape"/>
-		<Configuration caseListFile="gles31-multisample.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms4 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="multisample"/>
-		<Configuration caseListFile="gles31-565-no-depth-no-stencil.txt" commandLine="--deqp-gl-config-name=rgb565d0s0ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window" name="565-no-depth-no-stencil"/>
+		<Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
+		<Configuration caseListFile="gles31-rotate-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=0 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-portrait"/>
+		<Configuration caseListFile="gles31-rotate-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=90 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-landscape"/>
+		<Configuration caseListFile="gles31-rotate-reverse-portrait.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=180 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-reverse-portrait"/>
+		<Configuration caseListFile="gles31-rotate-reverse-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=270 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-reverse-landscape"/>
+		<Configuration caseListFile="gles31-multisample.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms4 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="multisample"/>
+		<Configuration caseListFile="gles31-565-no-depth-no-stencil.txt" commandLine="--deqp-gl-config-name=rgb565d0s0ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="565-no-depth-no-stencil"/>
 	</TestPackage>
 </Mustpass>
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 808d3e5..0d1b3bf 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -109,7 +109,7 @@
 	return "com.drawelements.deqp." + getModuleShorthand(package.module)
 
 def getCommandLine (config):
-	return "--deqp-gl-config-name=%s --deqp-screen-rotation=%s --deqp-surface-type=%s" % (config.glconfig, config.rotation, config.surfacetype)
+	return "--deqp-gl-config-name=%s --deqp-screen-rotation=%s --deqp-surface-type=%s --deqp-watchdog=enable" % (config.glconfig, config.rotation, config.surfacetype)
 
 def readCaseList (filename):
 	cases = []