From 6cc2ad09d86e6da5812485b0e50a820e2560b31b Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Tue, 19 Jan 2016 10:46:38 +0000
Subject: Correct the Issue number. Amend the test to use an option valid for
 dmd, ldc2, and gdc.

---
 .../Issues/2944/D_changed_DFLAGS_not_rebuilding.py | 23 ----------------------
 test/D/Issues/2944/image/SConstruct                | 11 -----------
 test/D/Issues/2944/image/main.d                    | 11 -----------
 .../Issues/2994/D_changed_DFLAGS_not_rebuilding.py | 23 ++++++++++++++++++++++
 test/D/Issues/2994/image/SConstruct                |  9 +++++++++
 test/D/Issues/2994/image/main.d                    | 11 +++++++++++
 6 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py
 delete mode 100644 test/D/Issues/2944/image/SConstruct
 delete mode 100644 test/D/Issues/2944/image/main.d
 create mode 100644 test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py
 create mode 100644 test/D/Issues/2994/image/SConstruct
 create mode 100644 test/D/Issues/2994/image/main.d

diff --git a/test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py b/test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py
deleted file mode 100644
index 1d9854f..0000000
--- a/test/D/Issues/2944/D_changed_DFLAGS_not_rebuilding.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Test to check for issue reported in tigris bug 2994
-# http://scons.tigris.org/issues/show_bug.cgi?id=2994
-#
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-dmd_present = test.detect_tool('dmd', prog='dmd')
-ldc_present = test.detect_tool('ldc',prog='ldc2')
-gdc_present = test.detect_tool('gdc',prog='gdc')
-
-if not (dmd_present or ldc_present or gdc_present):
-    test.skip_test("Could not load dmd ldc or gdc Tool; skipping test(s).\n")
-
-
-test.dir_fixture('image')
-test.run()
-test.fail_test('main.o' not in test.stdout())
-test.run(arguments='change=1')
-test.fail_test('is up to date' in test.stdout())
-
-test.pass_test()
diff --git a/test/D/Issues/2944/image/SConstruct b/test/D/Issues/2944/image/SConstruct
deleted file mode 100644
index 2c7deee..0000000
--- a/test/D/Issues/2944/image/SConstruct
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- codig:utf-8; -*-
-
-env=Environment()
-
-change = ARGUMENTS.get('change', 0)
-if int(change):
-    env.Append(DFLAGS = '-d')
-    
-env.Program('proj', ['main.d'])
-
-
diff --git a/test/D/Issues/2944/image/main.d b/test/D/Issues/2944/image/main.d
deleted file mode 100644
index f0aa23a..0000000
--- a/test/D/Issues/2944/image/main.d
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This program prints a
-   hello world message
-   to the console.  */
- 
-import std.stdio;
- 
-void main()
-{
-    writeln("Hello, World!");
-}
-
diff --git a/test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py b/test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py
new file mode 100644
index 0000000..1d9854f
--- /dev/null
+++ b/test/D/Issues/2994/D_changed_DFLAGS_not_rebuilding.py
@@ -0,0 +1,23 @@
+# Test to check for issue reported in tigris bug 2994
+# http://scons.tigris.org/issues/show_bug.cgi?id=2994
+#
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+dmd_present = test.detect_tool('dmd', prog='dmd')
+ldc_present = test.detect_tool('ldc',prog='ldc2')
+gdc_present = test.detect_tool('gdc',prog='gdc')
+
+if not (dmd_present or ldc_present or gdc_present):
+    test.skip_test("Could not load dmd ldc or gdc Tool; skipping test(s).\n")
+
+
+test.dir_fixture('image')
+test.run()
+test.fail_test('main.o' not in test.stdout())
+test.run(arguments='change=1')
+test.fail_test('is up to date' in test.stdout())
+
+test.pass_test()
diff --git a/test/D/Issues/2994/image/SConstruct b/test/D/Issues/2994/image/SConstruct
new file mode 100644
index 0000000..3d059e7
--- /dev/null
+++ b/test/D/Issues/2994/image/SConstruct
@@ -0,0 +1,9 @@
+# -*- coding:utf-8; -*-
+
+env=Environment()
+
+change = ARGUMENTS.get('change', 0)
+if int(change):
+    env.Append(DFLAGS = '-I.')
+
+env.Program('proj', ['main.d'])
diff --git a/test/D/Issues/2994/image/main.d b/test/D/Issues/2994/image/main.d
new file mode 100644
index 0000000..f0aa23a
--- /dev/null
+++ b/test/D/Issues/2994/image/main.d
@@ -0,0 +1,11 @@
+/* This program prints a
+   hello world message
+   to the console.  */
+ 
+import std.stdio;
+ 
+void main()
+{
+    writeln("Hello, World!");
+}
+
-- 
cgit v0.12