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/HSTeoh | |
| 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/HSTeoh')
4 files changed, 12 insertions, 0 deletions
diff --git a/test/D/HSTeoh/ArLibIssue/SConstruct_template b/test/D/HSTeoh/ArLibIssue/SConstruct_template index 81f81f5..b17847a 100644 --- a/test/D/HSTeoh/ArLibIssue/SConstruct_template +++ b/test/D/HSTeoh/ArLibIssue/SConstruct_template @@ -1,3 +1,6 @@ env = Environment({}) +import os +env['ENV']['HOME'] = os.environ['HOME'] # Hack for gdmd + env.StaticLibrary('mylib', ['a.d', 'b.d']) diff --git a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py index 26b477b..4716f1c 100644 --- a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py +++ b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py @@ -55,6 +55,10 @@ def testForTool(tool): 'ldc': ".*Unknown command line argument '-m64 -O'.*", }[tool] + from SCons.Environment import Base + if tool == 'dmd' and Base()['DC'] == 'gdmd': + result = ".*unrecognized command line option '-m64 -O'.*" + test.fail_test(not test.match_re_dotall(test.stderr(), result)) test.pass_test() diff --git a/test/D/HSTeoh/LibCompileOptions/SConstruct_template b/test/D/HSTeoh/LibCompileOptions/SConstruct_template index 7031f5c..1489624 100644 --- a/test/D/HSTeoh/LibCompileOptions/SConstruct_template +++ b/test/D/HSTeoh/LibCompileOptions/SConstruct_template @@ -1,5 +1,8 @@ env = Environment({}) +import os +env['ENV']['HOME'] = os.environ['HOME'] # Hack for gdmd + env.Library('mylib', 'mylib.d') prog_env = env.Clone( diff --git a/test/D/HSTeoh/LinkingProblem/SConstruct_template b/test/D/HSTeoh/LinkingProblem/SConstruct_template index a4aa795..2c53b54 100644 --- a/test/D/HSTeoh/LinkingProblem/SConstruct_template +++ b/test/D/HSTeoh/LinkingProblem/SConstruct_template @@ -6,6 +6,8 @@ environment = Environment( tools = ['cc', '{}', 'link'], LIBS = ['ncurses']) +environment['ENV']['HOME'] = os.environ['HOME'] # Hack for gdmd + environment.Object('ncurs_impl.o', 'ncurs_impl.c') environment.Program('prog', Split(""" |