summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJarkko Pöyry <jpoyry@google.com>2015-06-09 11:08:43 -0700
committerJarkko Pöyry <jpoyry@google.com>2015-06-09 11:10:11 -0700
commit624f8ecf68812089c888227ff15bf2101211e588 (patch)
tree51703e042b888fafcb465fdab9c3a1928a32d9b4 /data
parent58aae3be8e0f69d8e48f5a50dca830b0bfc1b136 (diff)
downloadVK-GL-CTS-624f8ecf68812089c888227ff15bf2101211e588.tar.gz
VK-GL-CTS-624f8ecf68812089c888227ff15bf2101211e588.tar.bz2
VK-GL-CTS-624f8ecf68812089c888227ff15bf2101211e588.zip
Convert negative pragma cases to positive.
- Convert negative #pragma debug and invalid token cases to expect successful compile. - Rename tests to match new behavior and remove cases from mustpass. Bug: 21725534 Change-Id: I4cb06d3038b551eb21b52f14dd341bb59519d38c
Diffstat (limited to 'data')
-rw-r--r--data/gles2/shaders/preprocessor.test12
-rw-r--r--data/gles3/shaders/preprocessor.test12
2 files changed, 16 insertions, 8 deletions
diff --git a/data/gles2/shaders/preprocessor.test b/data/gles2/shaders/preprocessor.test
index 6aeb5e111..d2dc32bba 100644
--- a/data/gles2/shaders/preprocessor.test
+++ b/data/gles2/shaders/preprocessor.test
@@ -2719,11 +2719,13 @@ group pragmas "Pragma Tests"
""
end
- case invalid_pragma_invalid_debug
- expect compile_fail
+ case pragma_unrecognized_debug
+ expect build_successful
both ""
#pragma debug(1.23)
+ // unrecognized preprocessor token
+
precision mediump float;
void main()
{
@@ -2732,11 +2734,13 @@ group pragmas "Pragma Tests"
""
end
- case invalid_pragma_invalid_token
- expect compile_fail
+ case pragma_unrecognized_token
+ expect build_successful
both ""
#pragma ¤¤½
+ // trailing bytes form a valid but unrecognized preprocessor token
+
precision mediump float;
void main()
{
diff --git a/data/gles3/shaders/preprocessor.test b/data/gles3/shaders/preprocessor.test
index ed5e1f998..12e0d8cf7 100644
--- a/data/gles3/shaders/preprocessor.test
+++ b/data/gles3/shaders/preprocessor.test
@@ -3287,13 +3287,15 @@ group pragmas "Pragma Tests"
""
end
- case invalid_pragma_invalid_debug
+ case pragma_unrecognized_debug
version 300 es
- expect compile_fail
+ expect build_successful
both ""
#version 300 es
#pragma debug(1.23)
+ // unrecognized preprocessor token
+
precision mediump float;
${DECLARATIONS}
void main()
@@ -3303,13 +3305,15 @@ group pragmas "Pragma Tests"
""
end
- case invalid_pragma_invalid_token
+ case pragma_unrecognized_token
version 300 es
- expect compile_fail
+ expect build_successful
both ""
#version 300 es
#pragma ¤¤½
+ // trailing bytes form a valid but unrecognized preprocessor token
+
precision mediump float;
${DECLARATIONS}
void main()