ENH: handle MSVS_VERSION additionally to MSVC_VERSION, but raise deprecation warnings...

[scons.git] / src / test_strings.py

diff --git a/src/test_strings.py b/src/test_strings.py
index a3ed6e84f981e3bafcfcf4e8fce7f0217916f1a0..59d7bca1a3196876381f6b37b759bcb1832f6e8c 100644 (file)
--- a/src/test_strings.py
+++ b/src/test_strings.py
@@ -111,6 +111,13 @@ class CheckUnexpandedStrings(Checker):
     def must_be_built(self):
         return None
 
+class CheckPassTest(Checker):
+    expressions = [
+        re.compile(r'\.pass_test()'),
+    ]
+    def must_be_built(self):
+        return None
+
 class CheckExpandedCopyright(Checker):
     expressions = [
         re.compile('Copyright.*The SCons Foundation'),
@@ -124,12 +131,14 @@ check_list = [
         'src',
         search_list = [ '*.py' ],
         remove_list = [
+            'engine/SCons/compat/_scons_optparse.py',
             'engine/SCons/compat/_scons_sets.py',
             'engine/SCons/compat/_scons_sets15.py',
+            'engine/SCons/compat/_scons_shlex.py',
             'engine/SCons/compat/_scons_subprocess.py',
+            'engine/SCons/compat/_scons_textwrap.py',
             'engine/SCons/Conftest.py',
             'engine/SCons/dblite.py',
-            'engine/SCons/Optik',
         ],
     ),
 
@@ -138,6 +147,14 @@ check_list = [
         search_list = [ '*.py' ],
     ),
 
+    CheckPassTest(
+        'test',
+        search_list = [ '*.py' ],
+        remove_list = [
+            'Fortran/common.py',
+        ],
+    ),
+
     CheckExpandedCopyright(
         build_scons,
         remove_list = [
@@ -147,37 +164,43 @@ check_list = [
             'debian',
             'dist',
             'gentoo',
+            'engine/SCons/compat/_scons_optparse.py',
             'engine/SCons/compat/_scons_sets.py',
             'engine/SCons/compat/_scons_sets15.py',
+            'engine/SCons/compat/_scons_shlex.py',
             'engine/SCons/compat/_scons_subprocess.py',
+            'engine/SCons/compat/_scons_textwrap.py',
             'engine/SCons/Conftest.py',
             'engine/SCons/dblite.py',
-            'engine/SCons/Optik',
             'MANIFEST',
             'os_spawnv_fix.diff',
             'setup.cfg',
         ],
         # We run epydoc on the *.py files, which generates *.pyc files.
         remove_patterns = [
-            '*.pyc'
+            '*.pyc',
         ]
     ),
 
     CheckExpandedCopyright(
         build_local,
         remove_list = [
+            'SCons/compat/_scons_optparse.py',
             'SCons/compat/_scons_sets.py',
             'SCons/compat/_scons_sets15.py',
+            'SCons/compat/_scons_shlex.py',
             'SCons/compat/_scons_subprocess.py',
+            'SCons/compat/_scons_textwrap.py',
             'SCons/Conftest.py',
             'SCons/dblite.py',
-            'SCons/Optik',
+            'scons-%s.egg-info' % scons_version,
         ],
     ),
 
     CheckExpandedCopyright(
         build_src,
         remove_list = [
+            'bench/timeit.py',
             'bin',
             'config',
             'debian',
@@ -194,6 +217,7 @@ check_list = [
             'doc/user/SCons-win32-install-2.jpg',
             'doc/user/SCons-win32-install-3.jpg',
             'doc/user/SCons-win32-install-4.jpg',
+            'examples',
             'gentoo',
             'QMTest/classes.qmc',
             'QMTest/configuration',
@@ -206,14 +230,17 @@ check_list = [
             'src/engine/MANIFEST.in',
             'src/engine/MANIFEST-xml.in',
             'src/engine/setup.cfg',
+            'src/engine/SCons/compat/_scons_optparse.py',
             'src/engine/SCons/compat/_scons_sets.py',
             'src/engine/SCons/compat/_scons_sets15.py',
+            'src/engine/SCons/compat/_scons_shlex.py',
             'src/engine/SCons/compat/_scons_subprocess.py',
+            'src/engine/SCons/compat/_scons_textwrap.py',
             'src/engine/SCons/Conftest.py',
             'src/engine/SCons/dblite.py',
-            'src/engine/SCons/Optik',
             'src/script/MANIFEST.in',
             'src/script/setup.cfg',
+            'test/Fortran/.exclude_tests',
         ],
     ),
 
@@ -239,3 +266,9 @@ if not_built:
     test.no_result(1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: