From 5ecccc638450e06302e69a8875359ce6a304125e Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 12 Aug 2018 01:08:12 -0400 Subject: updated test to reflect the removal of find function from mingw tool --- test/MinGW/MinGWSharedLibrary.py | 7 +++++-- test/MinGW/WINDOWS_INSERT_DEF.py | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/test/MinGW/MinGWSharedLibrary.py b/test/MinGW/MinGWSharedLibrary.py index dcebd45..86ddd43 100644 --- a/test/MinGW/MinGWSharedLibrary.py +++ b/test/MinGW/MinGWSharedLibrary.py @@ -32,8 +32,11 @@ when using MinGW. import sys import TestSCons +import SCons.Tool import SCons.Tool.mingw import SCons.Defaults +from SCons.Platform.mingw import MINGW_DEFAULT_PATHS +from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS _python_ = TestSCons._python_ @@ -42,10 +45,10 @@ test = TestSCons.TestSCons() if sys.platform not in ('cygwin','win32',): test.skip_test("Skipping mingw test on non-Windows %s platform."%sys.platform) -if not SCons.Tool.mingw.find(SCons.Defaults.DefaultEnvironment()): +gcc = SCons.Tool.find_program_path(test.Environment(), 'gcc', default_paths=MINGW_DEFAULT_PATHS + CYGWIN_DEFAULT_PATHS ) +if not gcc: test.skip_test("Skipping mingw test, no MinGW found.\n") - test.write('foobar.cc', """ int abc(int a) { return (a+1); diff --git a/test/MinGW/WINDOWS_INSERT_DEF.py b/test/MinGW/WINDOWS_INSERT_DEF.py index 67d3e9b..f82ebd8 100644 --- a/test/MinGW/WINDOWS_INSERT_DEF.py +++ b/test/MinGW/WINDOWS_INSERT_DEF.py @@ -31,8 +31,11 @@ Make sure that WINDOWS_INSERT_DEF isn't ignored when using MinGW. import sys import TestSCons +import SCons.Tool import SCons.Tool.mingw import SCons.Defaults +from SCons.Platform.mingw import MINGW_DEFAULT_PATHS +from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS test = TestSCons.TestSCons() @@ -40,7 +43,8 @@ if sys.platform not in ('cygwin', 'win32'): test.skip_test( "Skipping mingw test on non-Windows platform: %s" % sys.platform) -if not SCons.Tool.mingw.find(SCons.Defaults.DefaultEnvironment()): +gcc = SCons.Tool.find_program_path(test.Environment(), 'gcc', default_paths=MINGW_DEFAULT_PATHS + CYGWIN_DEFAULT_PATHS ) +if not gcc: test.skip_test("Skipping mingw test, no MinGW found.\n") test.write('hello.c', r""" -- cgit v0.12