merge current upstream

8 files changed, 36 insertions, 48 deletions

diff --git a/test/D/DMD.py b/test/D/DMD.py
index 2d9333a..8e09de4 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,12 +22,9 @@
 # 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.
-#
 
 #  Amended by Russel Winder <russel@russel.org.uk> 2010-05-05
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 import TestSCons
 
 import sys
diff --git a/test/D/GDC.py b/test/D/GDC.py
index b548b94..b73c09c 100644
--- a/test/D/GDC.py
+++ b/test/D/GDC.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,12 +22,9 @@
 # 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.
-#
 
 #  Amended by Russel Winder <russel@russel.org.uk> 2010-05-05
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
index cc1dc4f..8060b61 100644
--- a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
+++ b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
@@ -1,11 +1,6 @@
-"""
-These tests verify that SCons fails appropriately where the user has
-tried to supply multiple command line options via a single string rather
-than providing a list of strings, one string per option.
-"""
-
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,9 +20,13 @@ than providing a list of strings, one string per option.
 # 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__"
+"""
+These tests verify that SCons fails appropriately where the user has
+tried to supply multiple command line options via a single string rather
+than providing a list of strings, one string per option.
+"""
+
 
 import TestSCons
 
@@ -50,7 +49,6 @@ def testForTool(tool):
         config = f.read().format(tool)
     test.write('SConstruct', config)
 
-    test.run(status=2, stdout=None, stderr=None)
 
     result = {
         'dmd': ".*unrecognized switch '-m64 -O'.*",
@@ -58,11 +56,14 @@ 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.run(status=2, stdout=None, stderr=result, match=TestSCons.match_re_dotall)
+
+    # test.fail_test(not test.match_re_dotall(test.stderr(), result))
 
     test.pass_test()
 
diff --git a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
index d65495a..d9aee91 100644
--- a/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
+++ b/test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
@@ -1,9 +1,6 @@
-"""
-Test compiling and executing using the gdc tool.
-"""
-
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,9 +20,10 @@ Test compiling and executing using the gdc tool.
 # 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__"
+"""
+Test compiling and executing using the gdc tool.
+"""
 
 from Common.singleStringCannotBeMultipleOptions import testForTool
 testForTool('gdc')
diff --git a/test/D/LDC.py b/test/D/LDC.py
index 19070a5..aa242c1 100644
--- a/test/D/LDC.py
+++ b/test/D/LDC.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# MIT License
+#
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,12 +22,9 @@
 # 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.
-#
 
 #  Amended by Russel Winder <russel@russel.org.uk> 2010-05-05
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 import TestSCons
 
 from os.path import abspath, dirname
diff --git a/test/D/SharedObjects/Common/common.py b/test/D/SharedObjects/Common/common.py
index 5113cc4..d5588be 100644
--- a/test/D/SharedObjects/Common/common.py
+++ b/test/D/SharedObjects/Common/common.py
@@ -1,9 +1,9 @@
 """
 Support functions for all the tests.
 """
-
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,9 +23,6 @@ Support functions for all the tests.
 # 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__"
 
 import TestSCons
 
diff --git a/test/D/SharedObjects/sconstest-dmd.py b/test/D/SharedObjects/sconstest-dmd.py
index df6ddeb..7dca880 100644
--- a/test/D/SharedObjects/sconstest-dmd.py
+++ b/test/D/SharedObjects/sconstest-dmd.py
@@ -2,8 +2,9 @@
 Test compiling and executing using the dmd tool.
 """
 
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,9 +24,6 @@ Test compiling and executing using the dmd tool.
 # 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__"
 
 from Common.common import testForTool
 testForTool('dmd')
diff --git a/test/D/Support/executablesSearch.py b/test/D/Support/executablesSearch.py
index e24601c..c7da4ff 100755
--- a/test/D/Support/executablesSearch.py
+++ b/test/D/Support/executablesSearch.py
@@ -1,11 +1,6 @@
-#! /usr/bin/env python
-
-"""
-Support functions for all the tests.
-"""
-
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,9 +20,11 @@ Support functions for all the tests.
 # 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.
-#
+#! /usr/bin/env python
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+"""
+Support functions for all the tests.
+"""
 
 if __name__ == '__main__':
     import sys