Applied Benoit Belley's patch in ticket 1957 improve the robustness of

GetBuildFailures().  New function convert_to_buildError, and use it in
several places so all build failures now go through it and are
returned as BuildError exceptions.  Had a small effect on output
formatting in many tests but no significant change to behavior.  I
reworked the patch a little to keep SCons exit status values the same
as before; this patch could make it simpler to change them in some
cases, e.g. exit with the errno of the failed action if desired.  One
nice side effect of this patch is that more scons errors print the
node that caused the error now.

1 files changed, 2 insertions, 2 deletions

diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index f8447ca..554f8df 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -213,13 +213,13 @@ if sys.platform == 'win32' or string.find(sys.platform, 'irix') != -1:
     test.run(arguments = '-f SConstructFoo')
 else:
     test.run(arguments = '-f SConstructFoo', status=2, stderr='''\
-scons: \*\*\* Source file: foo\..* is static and is not compatible with shared target: .*
+scons: \*\*\* \[.*\] Source file: foo\..* is static and is not compatible with shared target: .*
 ''',
     match=TestSCons.match_re_dotall)
     # Run it again to make sure that we still get the error
     # even though the static objects already exist.
     test.run(arguments = '-f SConstructFoo', status=2, stderr='''\
-scons: \*\*\* Source file: foo\..* is static and is not compatible with shared target: .*
+scons: \*\*\* \[.*\] Source file: foo\..* is static and is not compatible with shared target: .*
 ''',
     match=TestSCons.match_re_dotall)