diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-11-05 00:34:14 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2021-11-05 00:34:14 (GMT) |
| commit | 6e9a1ebec8f1058db20750f7476eb984a6bd703b (patch) | |
| tree | f7a9310a715858dda89f6e56c278869adea39922 | |
| parent | aff07fb03efc323af95923fd0c9971f156e836ab (diff) | |
| download | SCons-6e9a1ebec8f1058db20750f7476eb984a6bd703b.zip SCons-6e9a1ebec8f1058db20750f7476eb984a6bd703b.tar.gz SCons-6e9a1ebec8f1058db20750f7476eb984a6bd703b.tar.bz2 | |
allow exit status of 1 or 2 on windows when running ninja
| -rw-r--r-- | test/ninja/ninja_handle_control_c_rebuild.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/ninja/ninja_handle_control_c_rebuild.py b/test/ninja/ninja_handle_control_c_rebuild.py index f75055d..0a2ba91 100644 --- a/test/ninja/ninja_handle_control_c_rebuild.py +++ b/test/ninja/ninja_handle_control_c_rebuild.py @@ -66,7 +66,12 @@ test.file_fixture( # run ninja independently program = test.workpath('run_ninja_env.bat') if IS_WINDOWS else ninja_bin -test.run(program=program, stdout=None, stderr=None, status=1) +if IS_WINDOWS: + test.fail_test(condition=(test.status in [1,2]), message="Expected exit status to be 1 or 2 was actually:%d"%test.status) +else: + test.fail_test(condition=(test.status==1), message="Expected exit status to be 1 was actually:%d"%test.status) + +test.run(program=program, stdout=None, stderr=None, status=None) if not IS_WINDOWS: error_msg = "ninja: error: rebuilding 'build.ninja': interrupted by user" |