summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-03-07 10:24:00 -0500
committerGitHub <noreply@github.com>2019-03-07 10:24:00 -0500
commit022a13375ece8cdfc8b86e9f08e4348af6643d61 (patch)
tree8f8f43c1952564f405f1fe581093011ff7ec84f0
parentf0f48202c59f8d00f47aaec25986d343e3c72ca4 (diff)
parent846971e251c8bc9d662c60a49465bfe972f730a3 (diff)
downloadscons-git-022a13375ece8cdfc8b86e9f08e4348af6643d61.tar.gz
Merge pull request #3316 from mwichmann/pypy-syntax
[PYPY] adjust two expect strings for PyPy msgs
-rw-r--r--test/Errors/SyntaxError.py2
-rw-r--r--test/Subst/SyntaxError.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Errors/SyntaxError.py b/test/Errors/SyntaxError.py
index 1b7f650b9..e6b8e4dc3 100644
--- a/test/Errors/SyntaxError.py
+++ b/test/Errors/SyntaxError.py
@@ -44,7 +44,7 @@ test.run(stdout = "scons: Reading SConscript files ...\n",
\^
-SyntaxError: invalid syntax
+SyntaxError: (invalid syntax|Unknown character)
""", status=2)
diff --git a/test/Subst/SyntaxError.py b/test/Subst/SyntaxError.py
index 94be46803..21d0d0b47 100644
--- a/test/Subst/SyntaxError.py
+++ b/test/Subst/SyntaxError.py
@@ -34,7 +34,7 @@ import TestSCons
test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
-expect_build = r"""scons: \*\*\*%s SyntaxError `invalid syntax( \((<string>, )?line 1\))?' trying to evaluate `%s'
+expect_build = r"""scons: \*\*\*%s SyntaxError `(invalid syntax|Unknown character)( \((<string>, )?line 1\))?' trying to evaluate `%s'
"""
expect_read = "\n" + expect_build + TestSCons.file_expr