[Mesa-dev] [PATCH] Fix glcpp test expectations

Vinson Lee vlee at freedesktop.org
Thu Jun 8 06:59:39 UTC 2017


On Wed, Jun 7, 2017 at 11:42 PM, Iago Toral Quiroga <itoral at igalia.com> wrote:
> With commit f7741985be0234 the we have changed some preprocessor
> error messages and warnings. Adapt related glcpp tests
> expectations accoridngly.
> ---
>  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 498dc0f..623438f 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 cd0071f..f5517da 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.9.3
>

Tested-by: Vinson Lee <vlee at freedesktop.org>


More information about the mesa-dev mailing list