Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 -s ours am: f0c5b...

am: 2c50f294f2  -s ours

Change-Id: I9e5e33115b6907b58f282d0337222b0302696e1e

diff --git a/android/cts/Android.mk b/android/cts/Android.mk
index 2eb34f7..762eb2a 100644 (file)
--- a/android/cts/Android.mk
+++ b/android/cts/Android.mk
@@ -21,7 +21,7 @@ LOCAL_MODULE := CtsDeqpTestCases
 LOCAL_MODULE_TAGS := optional
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
 
 LOCAL_SDK_VERSION := 22
 

diff --git a/android/package/Android.mk b/android/package/Android.mk
index 00db989..210ac5b 100644 (file)
--- a/android/package/Android.mk
+++ b/android/package/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts vts
 
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
 LOCAL_JNI_SHARED_LIBRARIES := libdeqp

diff --git a/modules/egl/teglGetFrameTimestampsTests.cpp b/modules/egl/teglGetFrameTimestampsTests.cpp
index d65d8d3..f3963bb 100644 (file)
--- a/modules/egl/teglGetFrameTimestampsTests.cpp
+++ b/modules/egl/teglGetFrameTimestampsTests.cpp
@@ -194,7 +194,8 @@ void populateFrameTimes(FrameTimes* frameTimes, TimestampInfoMap& map, const std
 
 bool timestampValid (EGLnsecsANDROID timestamp)
 {
-       return (timestamp >= 0) || (timestamp == EGL_TIMESTAMP_PENDING_ANDROID);
+       // \todo [2017-10-19 brianderson] Don't consider 0 invalid once kernel fix is in.
+       return (timestamp > 0) || (timestamp == EGL_TIMESTAMP_PENDING_ANDROID);
 }
 
 bool timestampPending (EGLnsecsANDROID timestamp)
@@ -241,7 +242,7 @@ void verifySingleFrame (const FrameTimes& frameTimes, tcu::ResultCollector& resu
        // be sure that the readsDone time must be after the renderingComplete time.
     // It may also be equal to the renderingComplete time if no reads were
     // peformed.
-       if (verifyReadsDone)
+       if (verifyReadsDone && timestampValid(frameTimes.readsDone))
                check_le(result, frameTimes.renderingComplete, frameTimes.readsDone, "Buffer rendering completed after reads completed.");
 
        // Verify CPU/GPU dependencies

diff --git a/modules/gles31/functional/es31fNegativeComputeTests.cpp b/modules/gles31/functional/es31fNegativeComputeTests.cpp
index 8d492ab..813a56a 100644 (file)
--- a/modules/gles31/functional/es31fNegativeComputeTests.cpp
+++ b/modules/gles31/functional/es31fNegativeComputeTests.cpp
@@ -248,7 +248,7 @@ void exceed_texture_image_units_limit (NegativeTestContext& ctx)
 
                ctx.beginSection("GL_INVALID_OPERATION error is generated if the sum of the number of active samplers for each active program exceeds the maximum number of texture image units allowed");
                ctx.glDispatchCompute(1, 1, 1);
-               ctx.expectError(GL_INVALID_VALUE);
+               ctx.expectError(GL_INVALID_OPERATION);
                ctx.endSection();
        }
 }