Fix negative block syntax tests expecting compile success.

Bug: 20852057
Change-Id: Ic92a6b1991a2580713c6f0d0e5c0ecd72bd59e14

diff --git a/data/gles3/shaders/uniform_block.test b/data/gles3/shaders/uniform_block.test
index 6c53f82..6806fc6 100644 (file)
--- a/data/gles3/shaders/uniform_block.test
+++ b/data/gles3/shaders/uniform_block.test
@@ -4713,7 +4713,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_vertex
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4751,7 +4751,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_fragment
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4789,7 +4789,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_no_instance_name_vertex
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4827,7 +4827,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_no_instance_name_fragment
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es

diff --git a/modules/gles3/scripts/gen-uniform-blocks.py b/modules/gles3/scripts/gen-uniform-blocks.py
index 9da1d55..d842a3a 100644 (file)
--- a/modules/gles3/scripts/gen-uniform-blocks.py
+++ b/modules/gles3/scripts/gen-uniform-blocks.py
@@ -910,8 +910,8 @@ invalidCases = (
                        + createCases("invalid_identifier_instance_name", invalidIdentifierInstanceNameShaderTemplate, False)
                        + createCases("double_underscore_block_name", doubleUnderscoreIdentifierBlockNameShaderTemplate, False)
                        + createCases("double_underscore_instance_name", doubleUnderscoreIdentifierInstanceNameShaderTemplate, False)
-                       + createCases("repeated_block", repeatedBlockShaderTemplate, True)
-                       + createCases("repeated_block_no_instance_name", repeatedBlockNoInstanceNameShaderTemplate, True)
+                       + createCases("repeated_block", repeatedBlockShaderTemplate, False)
+                       + createCases("repeated_block_no_instance_name", repeatedBlockNoInstanceNameShaderTemplate, False)
                )
 
 allCases.append(CaseGroup("valid", "Valid uniform interface block syntax tests.", validCases))