diff options
author | Brad King <brad.king@kitware.com> | 2021-01-27 14:05:37 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-27 14:05:43 (GMT) |
commit | 6153bd3a0c3413edf1898164e96b6fa5aebd78c1 (patch) | |
tree | 4925defb9ce94575098a46bf3e0e72722fb5c733 /Tests | |
parent | f39fb0b90de7002d2f66d118669a664540c6be7c (diff) | |
parent | 7c6192472be810de2da98bd6a3d03ac6661e24f5 (diff) | |
download | CMake-6153bd3a0c3413edf1898164e96b6fa5aebd78c1.zip CMake-6153bd3a0c3413edf1898164e96b6fa5aebd78c1.tar.gz CMake-6153bd3a0c3413edf1898164e96b6fa5aebd78c1.tar.bz2 |
Merge topic 'update-bison-parser'
7c6192472b LexerParser: Suppress -Wused-but-marked-unused warning in cmExprParser
6f64300a01 LexerParser: Clean up includes following include-what-you-use
699d50e376 LexerParser: Regenerate parser files with GNU Bison 3.7.4
c95442b9b1 LexerParser: Manual removing code from Bison is no longer needed
5a8a61a798 LexerParser: Do not use GNU Bison's yacc mode, we use Bison extensions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5730
Diffstat (limited to 'Tests')
6 files changed, 8 insertions, 8 deletions
diff --git a/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt index cf6dad5..71e8db3 100644 --- a/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt @@ -7,6 +7,6 @@ \${var - syntax error, unexpected \$end, expecting } \(6\) + syntax error, unexpected end of file, expecting } \(6\) Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt index 70e7c12..84ccdbe 100644 --- a/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt @@ -7,6 +7,6 @@ \${var - syntax error, unexpected \$end, expecting } \(6\) + syntax error, unexpected end of file, expecting } \(6\) Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt index 144b57c..24c810b 100644 --- a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt +++ b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt @@ -9,12 +9,12 @@ This warning is for project developers. Use -Wno-dev to suppress it. CMake Error at ParenInENV.cmake:2 \(message\): Syntax error in cmake code at - .*Tests/RunCMake/Syntax/ParenInENV.cmake:2 + .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2 when parsing string -->\$ENV{e - syntax error, unexpected \$end, expecting } \(10\) + syntax error, unexpected end of file, expecting } \(10\) Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt index cf63dbe..b309c3b 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt +++ b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt @@ -7,6 +7,6 @@ CMake Error at UnterminatedBrace0.cmake:2 \(set\): \${ - syntax error, unexpected \$end, expecting } \(3\) + syntax error, unexpected end of file, expecting } \(3\) Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt index 0e6f786..ffe0e2a 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt +++ b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt @@ -7,7 +7,7 @@ CMake Warning \(dev\) at UnterminatedBrace1.cmake:3 \(set\): \${ - syntax error, unexpected \$end, expecting } \(3\) + syntax error, unexpected end of file, expecting } \(3\) Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/math/MATH-InvalidExpression-stderr.txt b/Tests/RunCMake/math/MATH-InvalidExpression-stderr.txt index 22226f2..da44726 100644 --- a/Tests/RunCMake/math/MATH-InvalidExpression-stderr.txt +++ b/Tests/RunCMake/math/MATH-InvalidExpression-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at MATH-InvalidExpression.cmake:1 \(math\): - math cannot parse the expression: "INVALID": syntax error, unexpected \$end - \(7\). + math cannot parse the expression: "INVALID": syntax error, unexpected end + of file \(7\). Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ |