diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-09-12 17:59:39 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-09-12 17:59:39 (GMT) |
| commit | 2607d69b86683acd061491826b5bf304f552284d (patch) | |
| tree | a125cf2fc6f5024c9919f4a992b318c1350f0304 /test/D/DMD2_Alt.py | |
| parent | 87cb9ca579c9e8cc2d972552f8db6590b991cdeb (diff) | |
| parent | 70a6365e0bcf530819a83edaa3b9d9bbc08b218e (diff) | |
| download | SCons-2607d69b86683acd061491826b5bf304f552284d.zip SCons-2607d69b86683acd061491826b5bf304f552284d.tar.gz SCons-2607d69b86683acd061491826b5bf304f552284d.tar.bz2 | |
Merged in russel/scons (pull request #182), various fixes for the D tools and their tests
Diffstat (limited to 'test/D/DMD2_Alt.py')
| -rw-r--r-- | test/D/DMD2_Alt.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/D/DMD2_Alt.py b/test/D/DMD2_Alt.py index fbe2f2b..11c061d 100644 --- a/test/D/DMD2_Alt.py +++ b/test/D/DMD2_Alt.py @@ -28,15 +28,20 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons +import sys +from os.path import abspath, dirname, join +sys.path.append(join(dirname(abspath(__file__)), 'Support')) +from executablesSearch import isExecutableOfToolAvailable + _exe = TestSCons._exe test = TestSCons.TestSCons() -if not test.where_is('dmd') and not test.where_is('gdmd'): - test.skip_test("Could not find 'dmd' or 'gdmd', skipping test.\n") +if not isExecutableOfToolAvailable(test, 'dmd'): + test.skip_test("Could not find 'dmd'; skipping test.\n") test.write('SConstruct', """\ import os -env = Environment(tools=['dmd', 'link'], ENV=os.environ) +env = Environment(tools=['dmd', 'link']) if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj' # trick DMD env.Program('foo', 'foo.d') """) |