- fixes for MinGW under Windows, mainly skipping MSVS-specific tests

12 files changed, 57 insertions, 0 deletions

diff --git a/test/MSVC/PCH-source.py b/test/MSVC/PCH-source.py
index df6d6b15..c3c0f2e3 100644
--- a/test/MSVC/PCH-source.py
+++ b/test/MSVC/PCH-source.py
@@ -41,6 +41,10 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform

     test.skip_test(msg)

 

+import SCons.Tool.MSCommon as msc

+if not msc.msvc_exists():

+    msg = "No MSVC toolchain found...skipping test\n"

+    test.skip_test(msg)

 

 test.write('SConstruct', """\

 env = Environment(tools=['msvc', 'mslink'])

diff --git a/test/MSVC/PCHSTOP-errors.py b/test/MSVC/PCHSTOP-errors.py
index a4602832..d3ffc70b 100644
--- a/test/MSVC/PCHSTOP-errors.py
+++ b/test/MSVC/PCHSTOP-errors.py
@@ -39,6 +39,10 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
 
 
 SConstruct_path = test.workpath('SConstruct')
diff --git a/test/MSVC/TARGET_ARCH.py b/test/MSVC/TARGET_ARCH.py
index d6d8b43f..8b1c39d5 100644
--- a/test/MSVC/TARGET_ARCH.py
+++ b/test/MSVC/TARGET_ARCH.py
@@ -39,6 +39,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 test.write('SConstruct', """
 env_64 = Environment(tools=['default', 'msvc'],
                   TARGET_ARCH = 'amd64')
diff --git a/test/MSVC/batch-longlines.py b/test/MSVC/batch-longlines.py
index 5a042952..a5786fad 100644
--- a/test/MSVC/batch-longlines.py
+++ b/test/MSVC/batch-longlines.py
@@ -39,6 +39,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform

     test.skip_test(msg)

 

+import SCons.Tool.MSCommon as msc

+if not msc.msvc_exists():

+    msg = "No MSVC toolchain found...skipping test\n"

+    test.skip_test(msg)

+

 _python_ = TestSCons._python_

 

 for i in xrange(1,200):

diff --git a/test/MSVC/embed-manifest.py b/test/MSVC/embed-manifest.py
index 92f36a2b..286c2c7a 100644
--- a/test/MSVC/embed-manifest.py
+++ b/test/MSVC/embed-manifest.py
@@ -42,6 +42,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform

     test.skip_test(msg)

 

+import SCons.Tool.MSCommon as msc

+if not msc.msvc_exists():

+    msg = "No MSVC toolchain found...skipping test\n"

+    test.skip_test(msg)

+

 test.write('SConstruct', """\

 env=Environment(WINDOWS_EMBED_MANIFEST=True)

 env.Append(CCFLAGS = '/MD')

diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py
index f1308069..72e58133 100644
--- a/test/MSVC/hierarchical.py
+++ b/test/MSVC/hierarchical.py
@@ -38,6 +38,10 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
 
 
 test.subdir('src', 'build', 'out')
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index 106aed9e..d98ffbe4 100644
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -40,6 +40,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 #####
 # Test the basics
 
diff --git a/test/MSVC/multiple-pdb.py b/test/MSVC/multiple-pdb.py
index 0e8caa3a..8e866399 100644
--- a/test/MSVC/multiple-pdb.py
+++ b/test/MSVC/multiple-pdb.py
@@ -45,6 +45,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 test.write('SConstruct', """\
 env = Environment(PDB = '${TARGET.base}.pdb')
 env.Program('test1.cpp')
diff --git a/test/MSVC/pch-spaces-subdir.py b/test/MSVC/pch-spaces-subdir.py
index 991627ff..2b66a554 100644
--- a/test/MSVC/pch-spaces-subdir.py
+++ b/test/MSVC/pch-spaces-subdir.py
@@ -39,6 +39,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 test.write('Main.cpp', """\
 #include "Precompiled.h"
 
diff --git a/test/MSVC/pdb-VariantDir-path.py b/test/MSVC/pdb-VariantDir-path.py
index 796c36e5..899208ea 100644
--- a/test/MSVC/pdb-VariantDir-path.py
+++ b/test/MSVC/pdb-VariantDir-path.py
@@ -40,6 +40,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 test.subdir('src')
 
 test.write('SConstruct', """\
diff --git a/test/MSVC/pdb-manifest.py b/test/MSVC/pdb-manifest.py
index d70989f0..46189ac2 100644
--- a/test/MSVC/pdb-manifest.py
+++ b/test/MSVC/pdb-manifest.py
@@ -42,6 +42,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 test.write('SConstruct', """\
 env = Environment()
 
diff --git a/test/MSVC/query_vcbat.py b/test/MSVC/query_vcbat.py
index a6620086..f07f780b 100644
--- a/test/MSVC/query_vcbat.py
+++ b/test/MSVC/query_vcbat.py
@@ -33,6 +33,11 @@ if sys.platform != 'win32':
     msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
+import SCons.Tool.MSCommon as msc
+if not msc.msvc_exists():
+    msg = "No MSVC toolchain found...skipping test\n"
+    test.skip_test(msg)
+
 #####
 # Test the basics