glsl: glcpp: Extend testing of #line directives

The most recent commit adds support for comments and macro expansion
on #line directives. Add testing to verify the new features.

Signed-off-by: Carl Worth <cworth@cworth.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/glsl/glcpp/tests/091-hash-line.c
index fea35d37b053b14d3dfd35806e58a9d44e75e24e..26d70382a8985e4852b4a5f8195dec6eeed4fef2 100644 (file)
--- a/src/glsl/glcpp/tests/091-hash-line.c
+++ b/src/glsl/glcpp/tests/091-hash-line.c
@@ -6,3 +6,9 @@
 #error source 1, line 0 error
 #line 30 2
 #error source 2, line 30 error
+#line 45 2 /* A line with a comment */
+#define NINETY 90
+#define TWO 2
+#line NINETY TWO /* A #line line with macro expansion */
+#define FUNCTION_LIKE_MACRO(source, line) source line
+#line FUNCTION_LIKE_MACRO(180,2)

diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/glsl/glcpp/tests/091-hash-line.c.expected
index ea29149bc62b5fb7e1b7235a188ade6b478299bd..976d178dfb2072677263b99d57078fce3b9f1b87 100644 (file)
--- a/src/glsl/glcpp/tests/091-hash-line.c.expected
+++ b/src/glsl/glcpp/tests/091-hash-line.c.expected
@@ -11,3 +11,9 @@
 
 #line 30 2
 
+#line 45 2
+
+
+#line 90 2
+
+#line 180 2