diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-11-04 22:27:08 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2021-11-04 22:27:08 (GMT) |
| commit | f845a942080a9497782a9fab20130506cbf537c3 (patch) | |
| tree | 51094410b97e33a93e9476fd6807e21326d15a17 /test | |
| parent | d1872363ac38169b059e44f4b8f0bff1d9f0269a (diff) | |
| download | SCons-f845a942080a9497782a9fab20130506cbf537c3.zip SCons-f845a942080a9497782a9fab20130506cbf537c3.tar.gz SCons-f845a942080a9497782a9fab20130506cbf537c3.tar.bz2 | |
Fix ninja_handle_control_c_rebuild for windows. The stderr on windows doesn't match other platforms, but it should be sufficient to verify that build.ninja file still exists
Diffstat (limited to 'test')
| -rw-r--r-- | test/ninja/ninja_handle_control_c_rebuild.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/ninja/ninja_handle_control_c_rebuild.py b/test/ninja/ninja_handle_control_c_rebuild.py index 3a3adf4..f75055d 100644 --- a/test/ninja/ninja_handle_control_c_rebuild.py +++ b/test/ninja/ninja_handle_control_c_rebuild.py @@ -67,8 +67,11 @@ 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) -test.must_contain_all( - test.stderr(), "ninja: error: rebuilding 'build.ninja': interrupted by user") + +if not IS_WINDOWS: + error_msg = "ninja: error: rebuilding 'build.ninja': interrupted by user" + test.must_contain_all( + test.stderr(), error_msg ) # Verify that Rebuilding build.ninja and sending control-c to ninja doesn't remove build.ninja test.must_exist('build.ninja') |