diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-04-22 02:12:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 02:12:21 (GMT) |
| commit | d65c36a7d1a54176eb7315eb07b495153d05c048 (patch) | |
| tree | 93c3643ec545e7449bad83bd820eba9f56151108 /test | |
| parent | 5728acaff9b6bc9466bc6f1e5ae8280964443ce1 (diff) | |
| parent | 2b3a655bd778980cc09d268a7088e8f6afa7b50e (diff) | |
| download | SCons-d65c36a7d1a54176eb7315eb07b495153d05c048.zip SCons-d65c36a7d1a54176eb7315eb07b495153d05c048.tar.gz SCons-d65c36a7d1a54176eb7315eb07b495153d05c048.tar.bz2 | |
Merge branch 'master' into java-vers
Diffstat (limited to 'test')
| -rw-r--r-- | test/GetBuildFailures/serial.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py index 144d8bc..4d1b7cd 100644 --- a/test/GetBuildFailures/serial.py +++ b/test/GetBuildFailures/serial.py @@ -83,8 +83,8 @@ Command('f08', 'f08.in', raiseExcAction(SCons.Errors.UserError("My User Error")) Command('f09', 'f09.in', returnExcAction(SCons.Errors.UserError("My User Error"))) Command('f10', 'f10.in', raiseExcAction(MyBuildError(errstr="My Build Error", status=7))) Command('f11', 'f11.in', returnExcAction(MyBuildError(errstr="My Build Error", status=7))) -Command('f12', 'f12.in', raiseExcAction(OSError(123, "My EnvironmentError", "f12"))) -Command('f13', 'f13.in', returnExcAction(OSError(123, "My EnvironmentError", "f13"))) +Command('f12', 'f12.in', raiseExcAction(OSError(123, "My SConsEnvironmentError", "f12"))) +Command('f13', 'f13.in', returnExcAction(OSError(123, "My SConsEnvironmentError", "f13"))) Command('f14', 'f14.in', raiseExcAction(SCons.Errors.InternalError("My InternalError"))) Command('f15', 'f15.in', returnExcAction(SCons.Errors.InternalError("My InternalError"))) @@ -173,9 +173,9 @@ BF: f10 failed (7): My Build Error BF: action(["f10"], ["f10.in"]) BF: f11 failed (7): My Build Error BF: action(["f11"], ["f11.in"]) -BF: f12 failed (123): My EnvironmentError +BF: f12 failed (123): My SConsEnvironmentError BF: action(["f12"], ["f12.in"]) -BF: f13 failed (123): My EnvironmentError +BF: f13 failed (123): My SConsEnvironmentError BF: action(["f13"], ["f13.in"]) BF: f14 failed (2): InternalError : My InternalError BF: action(["f14"], ["f14.in"]) @@ -191,8 +191,8 @@ scons: *** [f08] My User Error scons: *** [f09] My User Error scons: *** [f10] My Build Error scons: *** [f11] My Build Error -scons: *** [f12] f12: My EnvironmentError -scons: *** [f13] f13: My EnvironmentError +scons: *** [f12] f12: My SConsEnvironmentError +scons: *** [f13] f13: My SConsEnvironmentError scons: *** [f14] InternalError : My InternalError """) + \ """\ |