diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-06-17 15:29:50 +0100 |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-06-17 15:29:50 +0100 |
| commit | 9188a16ed0cb5e0409fd2d0f9df55bda7767bc96 (patch) | |
| tree | 3c28b9589511a54df31039f86a7f6600274c7966 /test/D | |
| parent | bba945305240d352832cc291629bb99a10144ca3 (diff) | |
| download | scons-9188a16ed0cb5e0409fd2d0f9df55bda7767bc96.tar.gz | |
DMD and LDC do now support shared objects on MacOS. A couple of corrections.
Diffstat (limited to 'test/D')
| -rw-r--r-- | test/D/SharedObjects/Common/common.py | 5 | ||||
| -rw-r--r-- | test/D/SharedObjects/Image/SConstruct_template | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/test/D/SharedObjects/Common/common.py b/test/D/SharedObjects/Common/common.py index 03223856..a46ea7e4 100644 --- a/test/D/SharedObjects/Common/common.py +++ b/test/D/SharedObjects/Common/common.py @@ -63,9 +63,6 @@ def testForTool(tool): elif platform == 'darwin': filename = 'code.o' libraryname = 'libanswer.dylib' - # As at 2014-09-14, DMD 2.066, LDC master head, and GDC 4.9.1 do not support - # shared libraries on OSX. - test.skip_test('Dynamic libraries not yet supported on OSX.\n') elif platform == 'win32': filename = 'code.obj' libraryname = 'answer.dll' @@ -75,7 +72,7 @@ def testForTool(tool): test.dir_fixture('Image') test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool)) - if tool == 'dmd': + if Base()['DC'] == 'gdmd': # The gdmd executable in Debian Unstable as at 2012-05-12, version 4.6.3 puts out messages on stderr # that cause inappropriate failure of the tests, so simply ignore them. test.run(stderr=None) diff --git a/test/D/SharedObjects/Image/SConstruct_template b/test/D/SharedObjects/Image/SConstruct_template index cae87139..d263e63d 100644 --- a/test/D/SharedObjects/Image/SConstruct_template +++ b/test/D/SharedObjects/Image/SConstruct_template @@ -1,10 +1,7 @@ # -*- mode:python; coding:utf-8; -*- -import os - environment = Environment( - tools=['{}', 'link']) - -environment['ENV']['HOME'] = os.environ['HOME'] # Hack for gdmd + tools=['{0}', 'link'] +) environment.SharedLibrary('answer', 'code.d') |