summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/tests
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-11-20 17:23:42 -0800
committerMatt Turner <[email protected]>2012-11-28 10:26:53 -0800
commitaed466192a78ff2bb3db877a9599424de708cf90 (patch)
tree33e7e1f4700aff357776d57e703ec9fc5cf5815b /src/glsl/glcpp/tests
parent91ca053714957aca5205122e8478002c62cc4344 (diff)
glcpp: Reject #version and #line not followed by whitespace
Fixes part of es3conform's preprocess16_frag test. Reviewed-by: Carl Worth <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/tests')
-rw-r--r--src/glsl/glcpp/tests/108-no-space-after-hash-version.c1
-rw-r--r--src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected2
-rw-r--r--src/glsl/glcpp/tests/109-no-space-after-hash-line.c1
-rw-r--r--src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected2
4 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c
new file mode 100644
index 00000000000..0ce36f2eb1b
--- /dev/null
+++ b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c
@@ -0,0 +1 @@
+#version110
diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
new file mode 100644
index 00000000000..da4544a55ca
--- /dev/null
+++ b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
@@ -0,0 +1,2 @@
+0:1(3): preprocessor error: Invalid tokens after #
+
diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c
new file mode 100644
index 00000000000..f52966a8e80
--- /dev/null
+++ b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c
@@ -0,0 +1 @@
+#line2
diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
new file mode 100644
index 00000000000..da4544a55ca
--- /dev/null
+++ b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
@@ -0,0 +1,2 @@
+0:1(3): preprocessor error: Invalid tokens after #
+