Mesa (master): glsl/glcpp: Add tests for #define followed by comments

Ian Romanick idr at kemper.freedesktop.org
Thu Aug 7 23:08:46 UTC 2014


Module: Mesa
Branch: master
Commit: e84e159caac200287f1aada3c5c57aa3bf5cc376
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e84e159caac200287f1aada3c5c57aa3bf5cc376

Author: Carl Worth <cworth at cworth.org>
Date:   Tue Jul  1 17:49:45 2014 -0700

glsl/glcpp: Add tests for #define followed by comments

This simply tests the previous commit, (that #define followed by a comment
will still generate the expected "#define without macro name" error message).

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/glcpp/tests/139-define-without-macro-name.c          |    5 ++++-
 src/glsl/glcpp/tests/139-define-without-macro-name.c.expected |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/glsl/glcpp/tests/139-define-without-macro-name.c
index de3ed98..30e128d 100644
--- a/src/glsl/glcpp/tests/139-define-without-macro-name.c
+++ b/src/glsl/glcpp/tests/139-define-without-macro-name.c
@@ -1,2 +1,5 @@
 #define
-Error expected because no macro name is ever given!
+#define 
+#define /*...*/
+#define //...
+Errors expected because no macro name is ever given!
diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected
index 000aeaf..42b02d1 100644
--- a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected
+++ b/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected
@@ -1,2 +1,5 @@
 0:1(1): preprocessor error: #define without macro name
-Error expected because no macro name is ever given!
+0:2(1): preprocessor error: #define without macro name
+0:3(1): preprocessor error: #define without macro name
+0:4(1): preprocessor error: #define without macro name
+Errors expected because no macro name is ever given!




More information about the mesa-commit mailing list