diff options
| author | Russel Winder <russel@winder.org.uk> | 2014-12-21 17:47:01 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2014-12-21 17:47:01 (GMT) |
| commit | cf37fe92d43ccb0d2ec715fc603ca439588ee566 (patch) | |
| tree | 581f06d779d715f78d577bbcce940a4be9ed81a3 /test/D/SharedObjects | |
| parent | 975776d32d0f78b3a9d03a0c3ce29a3af2f1b872 (diff) | |
| download | SCons-cf37fe92d43ccb0d2ec715fc603ca439588ee566.zip SCons-cf37fe92d43ccb0d2ec715fc603ca439588ee566.tar.gz SCons-cf37fe92d43ccb0d2ec715fc603ca439588ee566.tar.bz2 | |
Hack the tests (in an agreed quasi-acceptable way) to avoid CI fails.
Diffstat (limited to 'test/D/SharedObjects')
| -rw-r--r-- | test/D/SharedObjects/Common/common.py | 3 | ||||
| -rw-r--r-- | test/D/SharedObjects/Image/SConstruct_template | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/test/D/SharedObjects/Common/common.py b/test/D/SharedObjects/Common/common.py index cb1e71b..83b5162 100644 --- a/test/D/SharedObjects/Common/common.py +++ b/test/D/SharedObjects/Common/common.py @@ -49,6 +49,9 @@ def testForTool(tool): if tool == 'gdc': test.skip_test('gdc does not, as at version 4.9.1, support shared libraries.\n') + if tool == 'dmd' and Base()['DC'] == 'gdmd': + test.skip_test('gdmd does not recognize the -shared option so cannot support linking of shared objects.\n') + platform = Base()['PLATFORM'] if platform == 'posix': diff --git a/test/D/SharedObjects/Image/SConstruct_template b/test/D/SharedObjects/Image/SConstruct_template index 213de7e..cae8713 100644 --- a/test/D/SharedObjects/Image/SConstruct_template +++ b/test/D/SharedObjects/Image/SConstruct_template @@ -5,4 +5,6 @@ import os environment = Environment( tools=['{}', 'link']) +environment['ENV']['HOME'] = os.environ['HOME'] # Hack for gdmd + environment.SharedLibrary('answer', 'code.d') |