From 5d5310f15a778ea7def731071f57a8b059aae6b0 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Tue, 14 Apr 2015 16:06:19 -0700 Subject: [PATCH] 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 --- android/cts/lmp-mr1/mustpass.xml | 4 ++-- android/cts/lmp/mustpass.xml | 4 ++-- android/cts/master/mustpass.xml | 32 ++++++++++++++++---------------- scripts/build_android_mustpass.py | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) 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 @@ - + - + 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 @@ - + - + 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 @@ - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + 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 @@ def getCTSPackageName (package): 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 = [] -- 2.7.4