diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-03-07 15:24:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 15:24:00 (GMT) |
| commit | 022a13375ece8cdfc8b86e9f08e4348af6643d61 (patch) | |
| tree | 8f8f43c1952564f405f1fe581093011ff7ec84f0 /test | |
| parent | f0f48202c59f8d00f47aaec25986d343e3c72ca4 (diff) | |
| parent | 846971e251c8bc9d662c60a49465bfe972f730a3 (diff) | |
| download | SCons-022a13375ece8cdfc8b86e9f08e4348af6643d61.zip SCons-022a13375ece8cdfc8b86e9f08e4348af6643d61.tar.gz SCons-022a13375ece8cdfc8b86e9f08e4348af6643d61.tar.bz2 | |
Merge pull request #3316 from mwichmann/pypy-syntax
[PYPY] adjust two expect strings for PyPy msgs
Diffstat (limited to 'test')
| -rw-r--r-- | test/Errors/SyntaxError.py | 2 | ||||
| -rw-r--r-- | test/Subst/SyntaxError.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Errors/SyntaxError.py b/test/Errors/SyntaxError.py index 1b7f650..e6b8e4d 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 94be468..21d0d0b 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 |