The changes to the D support evolved over the last many months packaged as a single changeset.

2 files changed, 67 insertions, 0 deletions

diff --git a/test/D/Support/executablesSearch.py b/test/D/Support/executablesSearch.py
new file mode 100755
index 0000000..e0487f6
--- /dev/null
+++ b/test/D/Support/executablesSearch.py
@@ -0,0 +1,67 @@
+#! /usr/bin/env python
+
+"""
+Support functions for all the tests.
+"""
+
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+def isExecutableOfToolAvailable(test, tool):
+    for executable in {
+        'dmd': ['dmd', 'gdmd'],
+        'gdc': ['gdc'],
+        'ldc': ['ldc2', 'ldc']}[tool]:
+        if test.where_is(executable):
+            return True
+    return False
+
+if __name__ == '__main__':
+    import unittest
+    import sys
+    import os.path
+    sys.path.append(os.path.abspath('../../../QMTest'))
+    sys.path.append(os.path.abspath('../../../src/engine'))
+    import TestSCons
+
+    class VariousTests(unittest.TestCase):
+        def setUp(self):
+            self.test = TestSCons.TestSCons()
+        def test_None_tool(self):
+            self.assertRaises(KeyError, isExecutableOfToolAvailable, self.test, None)
+        def test_dmd_tool(self):
+            self.assertEqual(
+                self.test.where_is('dmd') is not None or self.test.where_is('gdmd') is not None,
+                isExecutableOfToolAvailable(self.test, 'dmd'))
+        def test_gdc_tool(self):
+            self.assertEqual(
+                self.test.where_is('gdc') is not None,
+                isExecutableOfToolAvailable(self.test, 'gdc'))
+        def test_ldc_tool(self):
+            self.assertEqual(
+                self.test.where_is('ldc2') is not None or self.test.where_is('ldc') is not None,
+                isExecutableOfToolAvailable(self.test, 'ldc'))
+
+    unittest.main()
diff --git a/test/D/Support/sconstest.skip b/test/D/Support/sconstest.skip
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/D/Support/sconstest.skip