diff --git a/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected index af49a37369d..6af8033b0a3 100644 --- a/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected +++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected @@ -1,2 +1,2 @@ -0:2(8): preprocessor error: syntax error, unexpected $end +0:2(8): preprocessor error: syntax error, unexpected end of file diff --git a/src/compiler/glsl/glcpp/tests/glcpp_test.py b/src/compiler/glsl/glcpp/tests/glcpp_test.py index 457bf823612..d3fdc6b27d7 100644 --- a/src/compiler/glsl/glcpp/tests/glcpp_test.py +++ b/src/compiler/glsl/glcpp/tests/glcpp_test.py @@ -83,6 +83,10 @@ def test_output(glcpp, filename, expfile, nl_format='\n'): with open(expfile, 'r') as f: expected = f.read() + # Bison 3.6 changed '$end' to 'end of file' in its error messages + # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3181 + actual = actual.replace('$end', 'end of file') + if actual == expected: return (True, []) return (False, difflib.unified_diff(actual.splitlines(), expected.splitlines()))