glsl/glcpp: Rename one test to avoid a duplicate test number
authorCarl Worth <cworth@cworth.org>
Mon, 28 Jul 2014 19:26:06 +0000 (12:26 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 7 Aug 2014 23:08:29 +0000 (16:08 -0700)
With two tests both numbered 118, there was a confusing off-by-two difference
between the last test number and the total number of tests (as reported by
glcpp-test).

With this rename, there's only an off-by-one difference left, (which is easy
to understand given the zero-based test numbering).

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/glsl/glcpp/tests/118-multiple-else.c [deleted file]
src/glsl/glcpp/tests/118-multiple-else.c.expected [deleted file]
src/glsl/glcpp/tests/143-multiple-else.c [new file with mode: 0644]
src/glsl/glcpp/tests/143-multiple-else.c.expected [new file with mode: 0644]

diff --git a/src/glsl/glcpp/tests/118-multiple-else.c b/src/glsl/glcpp/tests/118-multiple-else.c
deleted file mode 100644 (file)
index 62ad49c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#if 0
-#else
-int foo;
-#else
-int bar;
-#endif
diff --git a/src/glsl/glcpp/tests/118-multiple-else.c.expected b/src/glsl/glcpp/tests/118-multiple-else.c.expected
deleted file mode 100644 (file)
index 00b3328..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-0:4(1): preprocessor error: multiple #else
-
-
-int foo;
-
-int bar;
-
diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/glsl/glcpp/tests/143-multiple-else.c
new file mode 100644 (file)
index 0000000..62ad49c
--- /dev/null
@@ -0,0 +1,6 @@
+#if 0
+#else
+int foo;
+#else
+int bar;
+#endif
diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/glsl/glcpp/tests/143-multiple-else.c.expected
new file mode 100644 (file)
index 0000000..00b3328
--- /dev/null
@@ -0,0 +1,7 @@
+0:4(1): preprocessor error: multiple #else
+
+
+int foo;
+
+int bar;
+