am a1665665: am 4ce5f630: Remove tests not feasible for M from mustpass
authorPyry Haulos <phaulos@google.com>
Mon, 27 Jul 2015 18:53:39 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jul 2015 18:53:39 +0000 (18:53 +0000)
* commit 'a1665665d4ed8a4bc9c3107e57fcdb5517efc851':
  Remove tests not feasible for M from mustpass

1  2 
android/cts/master/com.drawelements.deqp.gles3.xml
android/cts/master/com.drawelements.deqp.gles31.xml
android/cts/master/gles3-master.txt
android/cts/master/src/gles2-failures.txt
scripts/build_android_mustpass.py

Simple merge
@@@ -482,9 -486,9 +482,10 @@@ MASTER_GLES3_PKG                          = Package(module = 
  MASTER_GLES31_COMMON_FILTERS  = [
                include("gles31-master.txt"),
                exclude("gles31-hw-issues.txt"),
+               exclude("gles31-driver-issues.txt"),
                exclude("gles31-test-issues.txt"),
                exclude("gles31-spec-issues.txt"),
 +              exclude("gles31-new-tests.txt"),
        ]
  MASTER_GLES31_PKG                             = Package(module = GLES31_MODULE, configurations = [
                # Master