Mesa (master): Fix glcpp test expectations

[Iago Toral Quiroga]

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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Thu Jun  8 08:38:29 2017 +0200

Fix glcpp test expectations

With commit f7741985be0234 we have changed some preprocessor
error messages and warnings. Adapt related glcpp tests
expectations accordingly.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101336
Tested-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected         | 6 +++---
 src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
index 498dc0f98d..623438f675 100644
--- a/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
+++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
@@ -1,6 +1,6 @@
-0:2(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
-0:3(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
-0:4(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
+0:2(1): preprocessor error: Built-in (pre-defined) names cannot be undefined.
+0:3(1): preprocessor error: Built-in (pre-defined) names cannot be undefined.
+0:4(1): preprocessor error: Built-in (pre-defined) names cannot be undefined.
 #version 300 es
 
 
diff --git a/src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected b/src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected
index cd0071ff4d..f5517da3d7 100644
--- a/src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected
+++ b/src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected
@@ -1,3 +1,6 @@
+0:2(1): preprocessor warning:  names containing consecutive underscores are reserved.
+0:3(1): preprocessor warning:  names containing consecutive underscores are reserved.
+0:4(1): preprocessor warning:  names containing consecutive underscores are reserved.
 #version 110