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 c97bfc6..8db5189 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 945d6eb..41b579b 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 d248e6f..71ed3ac 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 8487ea9..a646218 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 46fe4db..d63b3c8 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 cd41f01..c9c1ec2 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 1a3f3f4..7357b30 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 70ee19a..4fa0627 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 d506c9f..78afa8a 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 8bcc16e..2ac258c 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 86dcfd2..cb3dead 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 22509cb..a27cfaf 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 53f8d15..97afcae 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']