aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2012-12-05 13:36:31 -0800
committerCarl Worth <[email protected]>2013-01-11 13:55:41 -0800
commitcc5fc8bf2f6a8b6390e4d9088060938fe23831e1 (patch)
tree096afbb116e53ef65fb64e6dfcdf7cb63fd3018b
parent2483039aca78078f21a57e8e950a0bc0181fbd3d (diff)
glcpp: Add tests for line continuation
First we test that line continuations are honored within a comment, (as recently changed in glcpp), then we test that line continuations can be disabled via an option within the context. This is tested via the new support for a test-specific command-line option passed to glcpp. Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/glsl/glcpp/tests/115-line-continuations.c9
-rw-r--r--src/glsl/glcpp/tests/115-line-continuations.c.expected10
-rw-r--r--src/glsl/glcpp/tests/116-disable-line-continuations.c13
-rw-r--r--src/glsl/glcpp/tests/116-disable-line-continuations.c.expected14
4 files changed, 46 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/glsl/glcpp/tests/115-line-continuations.c
new file mode 100644
index 00000000000..105590d85ed
--- /dev/null
+++ b/src/glsl/glcpp/tests/115-line-continuations.c
@@ -0,0 +1,9 @@
+// This comment continues to the next line, hiding the define \
+#define CONTINUATION_UNSUPPORTED
+
+#ifdef CONTINUATION_UNSUPPORTED
+failure
+#else
+success
+#endif
+
diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/glsl/glcpp/tests/115-line-continuations.c.expected
new file mode 100644
index 00000000000..f67ba1cf72e
--- /dev/null
+++ b/src/glsl/glcpp/tests/115-line-continuations.c.expected
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+success
+
+
+
diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/glsl/glcpp/tests/116-disable-line-continuations.c
new file mode 100644
index 00000000000..83d5ddf681b
--- /dev/null
+++ b/src/glsl/glcpp/tests/116-disable-line-continuations.c
@@ -0,0 +1,13 @@
+// glcpp-args: --disable-line-continuations
+
+// This comments ends with a backslash \\
+#define NO_CONTINUATION
+
+#ifdef NO_CONTINUATION
+success
+#else
+failure
+#endif
+
+
+
diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
new file mode 100644
index 00000000000..9b9a8c5b6b9
--- /dev/null
+++ b/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+success
+
+
+
+
+
+
+