From 05fbc42f3380435f378864b5d7d2b69083d7cd8e Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 18 Apr 2017 10:01:47 -0700 Subject: fix test to not run on OSX --- test/leaky-handles.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/leaky-handles.py b/test/leaky-handles.py index 9502d1b..3787ee2 100644 --- a/test/leaky-handles.py +++ b/test/leaky-handles.py @@ -29,12 +29,13 @@ Verify that file handles aren't leaked to child processes """ import os +import sys import TestSCons test = TestSCons.TestSCons() -if os.name != 'posix': +if os.name != 'posix' or sys.platform == 'darwin': msg = "Skipping fork leak test on non-posix platform '%s'\n" % os.name test.skip_test(msg) -- cgit v0.12 From 764801ecaf19fd73e75a90ba26452dd7c86a5138 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 18 Apr 2017 10:26:34 -0700 Subject: fix test for osx (with macports only at this point) --- test/SWIG/recursive-includes-cpp.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SWIG/recursive-includes-cpp.py b/test/SWIG/recursive-includes-cpp.py index 364bd73..dbcac6d 100644 --- a/test/SWIG/recursive-includes-cpp.py +++ b/test/SWIG/recursive-includes-cpp.py @@ -64,6 +64,7 @@ test.write("mod.i", """\ test.write('SConstruct', """\ import distutils.sysconfig +import sys DefaultEnvironment( tools = [ 'swig' ] ) @@ -77,6 +78,9 @@ env = Environment( SHLIBPREFIX = "" ) +if sys.platform == 'darwin': + env['LIBS']=['python%d.%d'%(sys.version_info[0],sys.version_info[1])] + env.SharedLibrary( 'mod.so', [ -- cgit v0.12 From 0a59346b5443a5b93fa8ada59519de0ccf95081e Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 18 Apr 2017 10:50:03 -0700 Subject: osx: disable mixedDandC test until a good way to specify correct gcc is found --- test/D/MixedDAndC/sconstest-dmd.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/D/MixedDAndC/sconstest-dmd.py b/test/D/MixedDAndC/sconstest-dmd.py index df66255..d96c5c3 100644 --- a/test/D/MixedDAndC/sconstest-dmd.py +++ b/test/D/MixedDAndC/sconstest-dmd.py @@ -27,6 +27,16 @@ Test compiling and executing a project with a C module. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import sys +if sys.platform == 'darwin': + import TestSCons + test = TestSCons.TestSCons() + + msg = "Skipping Mixed dmd test until a good way to ensure proper gcc is called." + "Calling default(system /usr/bin/gcc) gcc yields a surplus of linking errors\n" + test.skip_test(msg) + + from Common.common import testForTool testForTool('dmd') -- cgit v0.12