From: Carl Worth <cworth@cworth.org>
Date: Wed, 28 Nov 2012 20:57:09 +0000 (-0800)
Subject: glcpp: Extend the invalid-paste test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c86eb0cd65f04a242952bfc610d80341673b3d52;p=mesa.git

glcpp: Extend the invalid-paste test

The current code lets a few invalid pastes through, such as an string pasted
onto the end of an integer. Extend the invalid-paste test to catch some of
these.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/glsl/glcpp/tests/082-invalid-paste.c
index 40bf64411c5..8b84d50c3a0 100644
--- a/src/glsl/glcpp/tests/082-invalid-paste.c
+++ b/src/glsl/glcpp/tests/082-invalid-paste.c
@@ -1,2 +1,7 @@
 #define PASTE(x,y) x ## y
 PASTE(<,>)
+PASTE(0,abc)
+PASTE(1,=)
+PASTE(2,@)
+PASTE(3,-4)
+PASTE(4,+5.2)
diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/glsl/glcpp/tests/082-invalid-paste.c.expected
index 2c924406b59..2dd21c0635e 100644
--- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected
+++ b/src/glsl/glcpp/tests/082-invalid-paste.c.expected
@@ -1,5 +1,20 @@
 0:2(7): preprocessor error: 
 Pasting "<" and ">" does not give a valid preprocessing token.
+0:3(7): preprocessor error: 
+Pasting "0" and "abc" does not give a valid preprocessing token.
+0:4(7): preprocessor error: 
+Pasting "1" and "=" does not give a valid preprocessing token.
+0:5(7): preprocessor error: 
+Pasting "2" and "@" does not give a valid preprocessing token.
+0:6(7): preprocessor error: 
+Pasting "3" and "-" does not give a valid preprocessing token.
+0:7(7): preprocessor error: 
+Pasting "4" and "+" does not give a valid preprocessing token.
 
 <
+0
+1
+2
+34
+45.2