From 5e9e2eb6fced85e8cc59d1fcaa9ecb10b2d8f5aa Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Wed, 1 Mar 2023 14:00:43 -0700 Subject: test/import works on dummy qt tool now Signed-off-by: Mats Wichmann --- test/import.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/import.py b/test/import.py index 037508d..50d7b21 100644 --- a/test/import.py +++ b/test/import.py @@ -137,7 +137,7 @@ scons: warning: Could not detect qt3, using empty QT3DIR """ qt_moved = r""" -scons: \*\*\* Deprecated tool 'qt' has moved to 'qt3'. Please update your build accordingly. 'qt3' will be removed entirely in a future release. +scons: \*\*\* Deprecated tool 'qt' renamed to 'qt3'. Please update your build accordingly. 'qt3' will be removed entirely in a future release. """ qt3_warnings = [re.compile(qt3_err + TestSCons.file_expr)] @@ -181,9 +181,9 @@ for tool in tools: test.write('SConstruct', indirect_import % locals()) else: test.write('SConstruct', direct_import % locals()) - test.run(stderr=None) + test.run(stderr=None, status=None) stderr = test.stderr() - if stderr: + if stderr or test.status: matched = None for expression in error_output.get(tool, []): if expression.match(stderr): -- cgit v0.12