From ce53e8e61b9034ddf124a834a7d706c8a0e808ec Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 8 Jun 2017 08:38:29 +0200 Subject: [PATCH] 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 Reviewed-by: Samuel Pitoiset --- src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected | 6 +++--- .../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 498dc0f98d1..623438f6752 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 cd0071ff4d4..f5517da3d71 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 -- 2.30.2