From 98ab793448e35d692ae5dd82d56108dd7564a5b3 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Thu, 17 Nov 2022 09:58:49 -0700 Subject: Remove an extra check in one ninja test Caused it to unnecessarily skip the test on Windows platforms where the Python SCripts directory was not in the search path. Signed-off-by: Mats Wichmann --- CHANGES.txt | 6 ++++++ test/ninja/build_libraries.py | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 51680d7..d13ee27 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -63,6 +63,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Stop telling people to run "python setup.py install" in the User Guide. Adds new content on using virtualenvs to be able to have multiple different SCons versions available on one system. + - Added the "DefaultEnvironment(tools=[])" stanza to a number of tests + that are known to be particularly slow. It's still just a tiny + speedup, but the Windows CI had been occasionally timing out, + so maybe this helps a bit. + - Remove an extra existence check in one ninja test that caused it + to be skipped on some otherwise-valid Windows installations. From Andrew Morrow diff --git a/test/ninja/build_libraries.py b/test/ninja/build_libraries.py index 325031b..0a1941a 100644 --- a/test/ninja/build_libraries.py +++ b/test/ninja/build_libraries.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# MIT License +# # Copyright The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining @@ -34,10 +36,6 @@ try: except ImportError: test.skip_test("Could not find ninja module. Skipping test.\n") -ninja_binary = test.where_is('ninja') -if not ninja_binary: - test.skip_test("Could not find ninja executable. Skipping test.\n") - ninja_bin = os.path.abspath(os.path.join( ninja.__file__, os.pardir, -- cgit v0.12