summaryrefslogtreecommitdiffstats
path: root/test/D
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2016-01-19 17:30:41 (GMT)
committerRussel Winder <russel@winder.org.uk>2016-01-19 17:30:41 (GMT)
commit358c0de48a7d9fecdb30e24505c066506dfcdeff (patch)
treee3da370799409e61468868397770eeba5a5fe4bf /test/D
parent374acc32ce7ebecbc23dae5859315ddee17e523b (diff)
parent6cc2ad09d86e6da5812485b0e50a820e2560b31b (diff)
downloadSCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.zip
SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.gz
SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.bz2
Merge in default.
Diffstat (limited to 'test/D')
-rw-r--r--test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py (renamed from test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py)0
-rw-r--r--test/D/Issues/2994/image/SConstruct (renamed from test/D/Issues/2944/image/SConstruct)8
-rw-r--r--test/D/Issues/2994/image/main.d (renamed from test/D/Issues/2944/image/main.d)0
3 files changed, 3 insertions, 5 deletions
diff --git a/test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py b/test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py
index 1d9854f..1d9854f 100644
--- a/test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py
+++ b/test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py
diff --git a/test/D/Issues/2944/image/SConstruct b/test/D/Issues/2994/image/SConstruct
index 2c7deee..3d059e7 100644
--- a/test/D/Issues/2944/image/SConstruct
+++ b/test/D/Issues/2994/image/SConstruct
@@ -1,11 +1,9 @@
-# -*- codig:utf-8; -*-
+# -*- coding:utf-8; -*-
env=Environment()
change = ARGUMENTS.get('change', 0)
if int(change):
- env.Append(DFLAGS = '-d')
-
-env.Program('proj', ['main.d'])
-
+ env.Append(DFLAGS = '-I.')
+env.Program('proj', ['main.d'])
diff --git a/test/D/Issues/2944/image/main.d b/test/D/Issues/2994/image/main.d
index f0aa23a..f0aa23a 100644
--- a/test/D/Issues/2944/image/main.d
+++ b/test/D/Issues/2994/image/main.d