Fix failing tests on macosx

13 files changed, 78 insertions, 0 deletions

diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py
index c97bfc64..8db51897 100644
--- a/test/MSVS/vs-6.0-clean.py
+++ b/test/MSVS/vs-6.0-clean.py
@@ -30,9 +30,15 @@ project (.dsp) and solution (.dsw) files.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
 
diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py
index 945d6eb2..41b579b7 100644
--- a/test/MSVS/vs-6.0-files.py
+++ b/test/MSVS/vs-6.0-files.py
@@ -30,9 +30,15 @@ Test that we can generate Visual Studio 6 project (.dsp) and solution
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
 
diff --git a/test/MSVS/vs-6.0-variant_dir.py b/test/MSVS/vs-6.0-variant_dir.py
index d248e6f7..71ed3ac3 100644
--- a/test/MSVS/vs-6.0-variant_dir.py
+++ b/test/MSVS/vs-6.0-variant_dir.py
@@ -30,9 +30,15 @@ Test that we can generate Visual Studio 6 project (.dsp) and solution
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
 
diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py
index 8487ea98..a6462188 100644
--- a/test/MSVS/vs-7.0-clean.py
+++ b/test/MSVS/vs-7.0-clean.py
@@ -30,9 +30,15 @@ project (.vcproj) and solution (.sln) files.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
 
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index 46fe4dbd..d63b3c84 100644
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -30,11 +30,17 @@ solution (.sln) files that look correct.
 """
 
 import os
+import sys
+
 
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
 
diff --git a/test/MSVS/vs-7.0-variant_dir.py b/test/MSVS/vs-7.0-variant_dir.py
index cd41f01d..c9c1ec25 100644
--- a/test/MSVS/vs-7.0-variant_dir.py
+++ b/test/MSVS/vs-7.0-variant_dir.py
@@ -30,9 +30,15 @@ solution (.sln) files that look correct when using a variant_dir.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
 
diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py
index 1a3f3f40..7357b303 100644
--- a/test/MSVS/vs-7.1-clean.py
+++ b/test/MSVS/vs-7.1-clean.py
@@ -30,9 +30,15 @@ project (.vcproj) and solution (.sln) files.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
 
diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 70ee19a9..4fa06277 100644
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -30,11 +30,17 @@ solution (.sln) files that look correct.
 """
 
 import os
+import sys
+
 
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
 
diff --git a/test/MSVS/vs-7.1-variant_dir.py b/test/MSVS/vs-7.1-variant_dir.py
index d506c9fe..78afa8af 100644
--- a/test/MSVS/vs-7.1-variant_dir.py
+++ b/test/MSVS/vs-7.1-variant_dir.py
@@ -30,9 +30,15 @@ solution (.sln) files that look correct when using a variant_dir.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
 
diff --git a/test/MSVS/vs-8.0-clean.py b/test/MSVS/vs-8.0-clean.py
index 8bcc16e3..2ac258cd 100644
--- a/test/MSVS/vs-8.0-clean.py
+++ b/test/MSVS/vs-8.0-clean.py
@@ -30,9 +30,15 @@ project (.vcproj) and solution (.sln) files.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
 
diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py
index 86dcfd25..cb3dead1 100644
--- a/test/MSVS/vs-8.0-files.py
+++ b/test/MSVS/vs-8.0-files.py
@@ -30,11 +30,17 @@ solution (.sln) files that look correct.
 """
 
 import os
+import sys
+
 
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
 
diff --git a/test/MSVS/vs-8.0-variant_dir.py b/test/MSVS/vs-8.0-variant_dir.py
index 22509cb5..a27cfafd 100644
--- a/test/MSVS/vs-8.0-variant_dir.py
+++ b/test/MSVS/vs-8.0-variant_dir.py
@@ -30,9 +30,15 @@ solution (.sln) files that look correct when using a variant_dir.
 """
 
 import TestSConsMSVS
+import sys
+
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
 
diff --git a/test/MSVS/vs-8.0-x64-files.py b/test/MSVS/vs-8.0-x64-files.py
index 53f8d151..97afcae3 100644
--- a/test/MSVS/vs-8.0-x64-files.py
+++ b/test/MSVS/vs-8.0-x64-files.py
@@ -30,11 +30,17 @@ solution (.sln) files that look correct.
 """
 
 import os
+import sys
+
 
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
 
+if sys.platform != 'win32':
+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']