[Piglit] [PATCH 22/50] arb_program_interface_query: set KHR_no_error status

Samuel Pitoiset samuel.pitoiset at gmail.com
Thu Aug 10 15:22:22 UTC 2017


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 .../spec/arb_program_interface_query/compare-with-shader-subroutine.c | 1 +
 tests/spec/arb_program_interface_query/getprograminterfaceiv.c        | 1 +
 tests/spec/arb_program_interface_query/getprogramresourceindex.c      | 1 +
 tests/spec/arb_program_interface_query/getprogramresourceiv.c         | 4 +++-
 tests/spec/arb_program_interface_query/getprogramresourcename.c       | 1 +
 tests/spec/arb_program_interface_query/resource-location.c            | 1 +
 tests/spec/arb_program_interface_query/resource-query.c               | 1 +
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c b/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c
index 361df299a..f27c31dd5 100644
--- a/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c
+++ b/tests/spec/arb_program_interface_query/compare-with-shader-subroutine.c
@@ -73,6 +73,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
         config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_program_interface_query/getprograminterfaceiv.c b/tests/spec/arb_program_interface_query/getprograminterfaceiv.c
index 1d2ca0837..bada68a78 100755
--- a/tests/spec/arb_program_interface_query/getprograminterfaceiv.c
+++ b/tests/spec/arb_program_interface_query/getprograminterfaceiv.c
@@ -89,6 +89,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_program_interface_query/getprogramresourceindex.c b/tests/spec/arb_program_interface_query/getprogramresourceindex.c
index b19b0a20e..2933a7fdb 100755
--- a/tests/spec/arb_program_interface_query/getprogramresourceindex.c
+++ b/tests/spec/arb_program_interface_query/getprogramresourceindex.c
@@ -78,6 +78,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_program_interface_query/getprogramresourceiv.c b/tests/spec/arb_program_interface_query/getprogramresourceiv.c
index 42a425c26..2727a6c87 100755
--- a/tests/spec/arb_program_interface_query/getprogramresourceiv.c
+++ b/tests/spec/arb_program_interface_query/getprogramresourceiv.c
@@ -278,6 +278,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -1189,7 +1190,8 @@ piglit_display(void)
 	bool pass = true;
 	int i;
 
-	test_error_cases(&pass);
+	if (!piglit_khr_no_error)
+		test_error_cases(&pass);
 
 	/* run all the getprogramresourceiv tests */
 	for (i = 0; i < sizeof(subtests) / sizeof(struct subtest_t); i++) {
diff --git a/tests/spec/arb_program_interface_query/getprogramresourcename.c b/tests/spec/arb_program_interface_query/getprogramresourcename.c
index f2736d710..92ed8ceeb 100755
--- a/tests/spec/arb_program_interface_query/getprogramresourcename.c
+++ b/tests/spec/arb_program_interface_query/getprogramresourcename.c
@@ -84,6 +84,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_program_interface_query/resource-location.c b/tests/spec/arb_program_interface_query/resource-location.c
index b7cfa2bb8..b1e2ef73b 100755
--- a/tests/spec/arb_program_interface_query/resource-location.c
+++ b/tests/spec/arb_program_interface_query/resource-location.c
@@ -62,6 +62,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_program_interface_query/resource-query.c b/tests/spec/arb_program_interface_query/resource-query.c
index c4d190c89..a0bc3b700 100755
--- a/tests/spec/arb_program_interface_query/resource-query.c
+++ b/tests/spec/arb_program_interface_query/resource-query.c
@@ -128,6 +128,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.14.0



More information about the Piglit mailing list