From 9ac84f0a8242485f343710d5740f3d57746b7a80 Mon Sep 17 00:00:00 2001
From: Alexander Galazin <alexander.galazin@arm.com>
Date: Wed, 13 Jun 2018 14:33:29 +0200
Subject: [PATCH] Remove undefined EGL test cases

Affects:
dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
dEQP-EGL.functional.reusable_sync.valid.wait_server

VK-GL-CTS issue: 1196

Change-Id: I5f2484242139a2589a47413076555fba9fc1fa30
---
 android/cts/master/egl-master.txt                                     | 2 --
 android/cts/nyc/egl-master.txt                                        | 2 --
 android/cts/nyc/src/egl-master.txt                                    | 2 --
 .../openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt  | 2 --
 .../data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt        | 2 --
 .../openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/egl-master.txt  | 2 --
 .../data/mustpass/egl/aosp_mustpass/3.2.4.x/src/egl-master.txt        | 2 --
 .../openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt  | 2 --
 .../openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt   | 2 --
 modules/egl/teglSyncTests.cpp                                         | 4 ----
 10 files changed, 22 deletions(-)

diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 0a49730..dfce511 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -3279,7 +3279,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3293,7 +3292,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/android/cts/nyc/egl-master.txt b/android/cts/nyc/egl-master.txt
index 22ae57e..e226b80 100644
--- a/android/cts/nyc/egl-master.txt
+++ b/android/cts/nyc/egl-master.txt
@@ -3229,7 +3229,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3243,7 +3242,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/android/cts/nyc/src/egl-master.txt b/android/cts/nyc/src/egl-master.txt
index 9426a8f..0a49063 100644
--- a/android/cts/nyc/src/egl-master.txt
+++ b/android/cts/nyc/src/egl-master.txt
@@ -3229,7 +3229,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3243,7 +3242,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
index 0b77979..1685fc5 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
@@ -3265,7 +3265,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3279,7 +3278,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
index 9df361a..b0ee43d 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
@@ -3344,7 +3344,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3358,7 +3357,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/egl-master.txt
index ca8fe77..49b37ab 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/egl-master.txt
@@ -3277,7 +3277,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3291,7 +3290,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/src/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/src/egl-master.txt
index d735735..46bef17 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/src/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.4.x/src/egl-master.txt
@@ -3356,7 +3356,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3370,7 +3369,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
index fe4a986..0cd7466 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.5.x/egl-master.txt
@@ -3280,7 +3280,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3294,7 +3293,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
index 9363c7f..84e7f52 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
@@ -3280,7 +3280,6 @@ dEQP-EGL.functional.reusable_sync.valid.get_type
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3294,7 +3293,6 @@ dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/modules/egl/teglSyncTests.cpp b/modules/egl/teglSyncTests.cpp
index a21f0d2..17e841c 100644
--- a/modules/egl/teglSyncTests.cpp
+++ b/modules/egl/teglSyncTests.cpp
@@ -1293,9 +1293,6 @@ void ReusableSyncTests::init (void)
 		// eglDestroySyncKHR tests
 		valid->addChild(new DestroySyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 
-		// eglWaitSyncKHR tests
-		valid->addChild(new WaitSyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
-
 		addChild(valid);
 	}
 
@@ -1325,7 +1322,6 @@ void ReusableSyncTests::init (void)
 		// eglWaitSyncKHR tests
 		invalid->addChild(new WaitSyncInvalidDisplayTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 		invalid->addChild(new WaitSyncInvalidSyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
-		invalid->addChild(new WaitSyncInvalidFlagTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 
 		addChild(invalid);
 	}
-- 
2.7.4