diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-11-10 15:10:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 15:10:13 -0800 |
| commit | 2588b9e395357e58d4912cb2e7745ad00cb88b72 (patch) | |
| tree | 462ed0017ce9e4342309b882ff5b0349353d10d6 | |
| parent | fc2facd7b42106ce07a551e5d7fa2a3100716d32 (diff) | |
| parent | 27010dc6a39d7945c34500b77e0669177e6faa2c (diff) | |
| download | scons-git-2588b9e395357e58d4912cb2e7745ad00cb88b72.tar.gz | |
Merge pull request #4056 from mwichmann/scons-time-test
Skip two scons-time tests on Windows
| -rw-r--r-- | test/scons-time/run/config/python.py | 10 | ||||
| -rw-r--r-- | test/scons-time/run/option/python.py | 11 |
2 files changed, 14 insertions, 7 deletions
diff --git a/test/scons-time/run/config/python.py b/test/scons-time/run/config/python.py index bf873faac..ac6d1e39d 100644 --- a/test/scons-time/run/config/python.py +++ b/test/scons-time/run/config/python.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 @@ -25,15 +27,17 @@ Verify specifying an alternate Python executable in a config file. """ -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - import os import TestSCons_time +from TestCmd import IS_WINDOWS _python_ = TestSCons_time._python_ test = TestSCons_time.TestSCons_time() +if IS_WINDOWS: + # tests expect Windows file assoc to run my_python, not in our control. + test.skip_test("Skipping test on win32 due to launch problems.") test.write_sample_project('foo.tar.gz') diff --git a/test/scons-time/run/option/python.py b/test/scons-time/run/option/python.py index 27ca0722d..d117f2c51 100644 --- a/test/scons-time/run/option/python.py +++ b/test/scons-time/run/option/python.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__" """ Verify the run --python option to specify an alternatie Python executable. @@ -31,10 +30,14 @@ Verify the run --python option to specify an alternatie Python executable. import os import TestSCons_time +from TestCmd import IS_WINDOWS _python_ = TestSCons_time._python_ test = TestSCons_time.TestSCons_time() +if IS_WINDOWS: + # tests expect Windows file assoc to run my_python, not in our control. + test.skip_test("Skipping test on win32 due to launch problems.") test.write_sample_project('foo.tar.gz') |