From: Carl Worth <cworth@cworth.org>
Date: Mon, 28 Jul 2014 19:26:06 +0000 (-0700)
Subject: glsl/glcpp: Rename one test to avoid a duplicate test number
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f28a105868d2c1913746de3875dda000c14069fb;p=mesa.git

glsl/glcpp: Rename one test to avoid a duplicate test number

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>
---

diff --git a/src/glsl/glcpp/tests/118-multiple-else.c b/src/glsl/glcpp/tests/118-multiple-else.c
deleted file mode 100644
index 62ad49cf7bb..00000000000
--- a/src/glsl/glcpp/tests/118-multiple-else.c
+++ /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
index 00b3328c835..00000000000
--- a/src/glsl/glcpp/tests/118-multiple-else.c.expected
+++ /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
index 00000000000..62ad49cf7bb
--- /dev/null
+++ b/src/glsl/glcpp/tests/143-multiple-else.c
@@ -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
index 00000000000..00b3328c835
--- /dev/null
+++ b/src/glsl/glcpp/tests/143-multiple-else.c.expected
@@ -0,0 +1,7 @@
+0:4(1): preprocessor error: multiple #else
+
+
+int foo;
+
+int bar;
+