From 846971e251c8bc9d662c60a49465bfe972f730a3 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Fri, 1 Mar 2019 13:01:17 -0700 Subject: [PYPY support] adjust two expect strings for PyPy msgs To help support pypy, two test expect-strings are adjusted to accept either the error message from CPython ("Syntax error: invalid syntax") and from PyPy ("Syntax error: Unknown character"). Signed-off-by: Mats Wichmann --- test/Errors/SyntaxError.py | 2 +- 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( \((, )?line 1\))?' trying to evaluate `%s' +expect_build = r"""scons: \*\*\*%s SyntaxError `(invalid syntax|Unknown character)( \((, )?line 1\))?' trying to evaluate `%s' """ expect_read = "\n" + expect_build + TestSCons.file_expr -- cgit v0.12