diff options
| author | Russel Winder <russel@winder.org.uk> | 2014-09-06 15:25:28 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2014-09-06 15:25:28 (GMT) |
| commit | 70a6365e0bcf530819a83edaa3b9d9bbc08b218e (patch) | |
| tree | 6aa16a6e3f77e01d22fe3af6474d4192d2f8ba77 /test/D/Issues | |
| parent | 414cb583cf31b2a8c65704e57dd19cfb865e6582 (diff) | |
| download | SCons-70a6365e0bcf530819a83edaa3b9d9bbc08b218e.zip SCons-70a6365e0bcf530819a83edaa3b9d9bbc08b218e.tar.gz SCons-70a6365e0bcf530819a83edaa3b9d9bbc08b218e.tar.bz2 | |
Deal better with the discovery of a suitable D compiler executable.
Diffstat (limited to 'test/D/Issues')
| -rw-r--r-- | test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py | 16 | ||||
| -rw-r--r-- | test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py index 3b178b9..d44c9bd 100644 --- a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py +++ b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py @@ -50,7 +50,21 @@ def testForTool(tool): test.run() - for f in ('libstuff.so', 'stuff.os', 'test1', 'test1.o', 'test2', 'test2.o'): + platform = Base()['PLATFORM'] + + if platform == 'posix': + libraryname = 'libstuff.so' + filename = 'stuff.os' + elif platform == 'darwin': + libraryname = 'libstuff.dylib' + filename = 'stuff.os' + elif platform == 'win32': + libraryname = 'stuff.dll' + filename = 'stuff.obj' + else: + test.fail_test('No information about platform: ' + platform) + + for f in (libraryname, filename, 'test1', 'test1.o', 'test2', 'test2.o'): test.must_exist(test.workpath(join('test', 'test1', f))) test.pass_test() diff --git a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py index 3b178b9..d44c9bd 100644 --- a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py +++ b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py @@ -50,7 +50,21 @@ def testForTool(tool): test.run() - for f in ('libstuff.so', 'stuff.os', 'test1', 'test1.o', 'test2', 'test2.o'): + platform = Base()['PLATFORM'] + + if platform == 'posix': + libraryname = 'libstuff.so' + filename = 'stuff.os' + elif platform == 'darwin': + libraryname = 'libstuff.dylib' + filename = 'stuff.os' + elif platform == 'win32': + libraryname = 'stuff.dll' + filename = 'stuff.obj' + else: + test.fail_test('No information about platform: ' + platform) + + for f in (libraryname, filename, 'test1', 'test1.o', 'test2', 'test2.o'): test.must_exist(test.workpath(join('test', 'test1', f))) test.pass_test() |