Skip to content

Commit a197ed4

Browse files
authored
Merge pull request SCons#4551 from mwichmann/runtest-exit5
runtest.py now recognizes exit code 5
2 parents d7bfe06 + 0581a56 commit a197ed4

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

CHANGES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
8585
Now matches the annotation and docstring (which were prematurely
8686
updated in 4.6). All SCons usage except unit test was already fully
8787
consistent with a bool.
88+
- The test runner now recognizes the unittest module's return code of 5,
89+
which means no tests were run. SCons/Script/MainTests.py currently
90+
has no tests, so this particular error code is expected - should not
91+
cause runtest to give up with an "unknown error code".
8892
- Updated the notes about reproducible builds with SCons and the example.
8993
- The Clone() method now respects the variables argument (fixes #3590)
9094

RELEASE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ DEVELOPMENT
100100
The repo-wide line-ending is now `lf`, with the exception of a few
101101
Windows-only files using `crlf` instead. Any files not already fitting
102102
this format have been explicitly converted.
103+
- The test runner now recognizes the unittest module's return code of 5,
104+
which means no tests were run. SCons/Script/MainTests.py currently
105+
has no tests, so this particular error code is expected - should not
106+
cause runtest to give up with an "unknown error code".
103107

104108

105109
Thanks to the following contributors listed below for their contributions to this release.

runtest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ class SystemExecutor(RuntestBase):
417417
def execute(self, env):
418418
self.stderr, self.stdout, s = spawn_it(self.command_args, env)
419419
self.status = s
420-
if s < 0 or s > 2:
420+
if s < 0 or s > 2 and s != 5:
421421
sys.stdout.write("Unexpected exit status %d\n" % s)
422422

423423

0 commit comments

Comments
 (0)