diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-11-01 19:28:12 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2021-11-01 19:28:12 (GMT) |
| commit | 5c0d91c3a38effd1ce4305e71168ea9e924437cb (patch) | |
| tree | 9111b173efbc82a878db324033d48d940eefc9e6 | |
| parent | a2a6c9c333b245530b3ec34c7c8d88fca8d700c4 (diff) | |
| download | SCons-5c0d91c3a38effd1ce4305e71168ea9e924437cb.zip SCons-5c0d91c3a38effd1ce4305e71168ea9e924437cb.tar.gz SCons-5c0d91c3a38effd1ce4305e71168ea9e924437cb.tar.bz2 | |
fixed tests to test --no-ignore-skips, and updated their copyright text
| -rw-r--r-- | test/runtest/baseline/no_result.py | 8 | ||||
| -rw-r--r-- | test/runtest/simple/no_result.py | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/test/runtest/baseline/no_result.py b/test/runtest/baseline/no_result.py index b63d0c6..d00f536 100644 --- a/test/runtest/baseline/no_result.py +++ b/test/runtest/baseline/no_result.py @@ -48,11 +48,17 @@ expect_stderr = """\ NO RESULT TEST STDERR """ -test.run(arguments='-k -b . test/no_result.py', +test.run(arguments='--no-ignore-skips -k -b . test/no_result.py', status=2, stdout=expect_stdout, stderr=expect_stderr) +test.run(arguments='-k -b . test/no_result.py', + status=0, + stdout=expect_stdout, + stderr=expect_stderr) + + test.pass_test() # Local Variables: diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py index 2fd40b4..33f28e4 100644 --- a/test/runtest/simple/no_result.py +++ b/test/runtest/simple/no_result.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# __COPYRIGHT__ +# MIT License +# +# Copyright The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -20,9 +22,6 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ Test how we handle a no-results test specified on the command line. @@ -48,11 +47,17 @@ expect_stderr = """\ NO RESULT TEST STDERR """ -test.run(arguments='-k test/no_result.py', +test.run(arguments='--no-ignore-skips -k test/no_result.py', status=2, stdout=expect_stdout, stderr=expect_stderr) +test.run(arguments='-k test/no_result.py', + status=0, + stdout=expect_stdout, + stderr=expect_stderr) + + test.pass_test() # Local Variables: |