diff options
author | Steven Knight <knight@baldmt.com> | 2008-09-23 16:15:40 +0000 |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2008-09-23 16:15:40 +0000 |
commit | d1a640e30e75f6ec59de6f909fd4f7f61d920754 (patch) | |
tree | f620e13a07710c9cd136d38ce78491e16baeb273 /test/MSVS | |
parent | a89889c5ef39b00b860afa490747797a31963c72 (diff) | |
download | scons-d1a640e30e75f6ec59de6f909fd4f7f61d920754.tar.gz |
Refactor Visual Studio testing logic into a separate TestSConsMSVS
subclass, in its own module.
Diffstat (limited to 'test/MSVS')
-rw-r--r-- | test/MSVS/common-prefix.py | 4 | ||||
-rw-r--r-- | test/MSVS/runfile.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-6.0-exec.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-6.0-files.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-7.0-exec.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-7.0-files.py | 6 | ||||
-rw-r--r-- | test/MSVS/vs-7.1-exec.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-7.1-files.py | 6 | ||||
-rw-r--r-- | test/MSVS/vs-8.0-exec.py | 4 | ||||
-rw-r--r-- | test/MSVS/vs-8.0-files.py | 6 |
10 files changed, 23 insertions, 23 deletions
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py index 4034a4a5..5a49a8c2 100644 --- a/test/MSVS/common-prefix.py +++ b/test/MSVS/common-prefix.py @@ -35,9 +35,9 @@ import os.path import sys import TestCmd -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py index 23fd84b9..c775bdc7 100644 --- a/test/MSVS/runfile.py +++ b/test/MSVS/runfile.py @@ -35,9 +35,9 @@ import os.path import sys import TestCmd -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py index 3fe3f161..2b76db46 100644 --- a/test/MSVS/vs-6.0-exec.py +++ b/test/MSVS/vs-6.0-exec.py @@ -32,9 +32,9 @@ Visual Studio 6 project (.dsp) and solution (.dsw) files. import os import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py index 8153b52d..8da84a69 100644 --- a/test/MSVS/vs-6.0-files.py +++ b/test/MSVS/vs-6.0-files.py @@ -32,9 +32,9 @@ Test that we can generate Visual Studio 6 project (.dsp) and solution import os import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() # 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-exec.py b/test/MSVS/vs-7.0-exec.py index c4ef414d..5ffb35c1 100644 --- a/test/MSVS/vs-7.0-exec.py +++ b/test/MSVS/vs-7.0-exec.py @@ -32,9 +32,9 @@ Visual Studio 7.0 project (.vcproj) and solution (.sln) files. import os import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py index 9f51c8ce..5992c8c7 100644 --- a/test/MSVS/vs-7.0-files.py +++ b/test/MSVS/vs-7.0-files.py @@ -33,9 +33,9 @@ import os import os.path import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() # Make the test infrastructure think we have this version of MSVS installed. test._msvs_versions = ['7.0'] @@ -203,7 +203,7 @@ test.must_not_exist(test.workpath('work1', 'Test.sln')) # Test that running SCons with $PYTHON_ROOT in the environment # changes the .vcproj output as expected. os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSCons.python)[1]) +python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) test.run(chdir='work1', arguments='Test.vcproj') diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py index 03fec815..0f99def4 100644 --- a/test/MSVS/vs-7.1-exec.py +++ b/test/MSVS/vs-7.1-exec.py @@ -32,9 +32,9 @@ Visual Studio 7.1 project (.vcproj) and solution (.sln) files. import os import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py index e1f90106..b4b4e2d3 100644 --- a/test/MSVS/vs-7.1-files.py +++ b/test/MSVS/vs-7.1-files.py @@ -33,9 +33,9 @@ import os import os.path import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() # Make the test infrastructure think we have this version of MSVS installed. test._msvs_versions = ['7.1'] @@ -205,7 +205,7 @@ test.must_not_exist(test.workpath('work1', 'Test.sln')) # Test that running SCons with $PYTHON_ROOT in the environment # changes the .vcproj output as expected. os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSCons.python)[1]) +python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) test.run(chdir='work1', arguments='Test.vcproj') diff --git a/test/MSVS/vs-8.0-exec.py b/test/MSVS/vs-8.0-exec.py index f41e2beb..b43b2d4d 100644 --- a/test/MSVS/vs-8.0-exec.py +++ b/test/MSVS/vs-8.0-exec.py @@ -32,9 +32,9 @@ Visual Studio 8.0 project (.vcproj) and solution (.sln) files. import os import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py index 0664d234..f76c90f6 100644 --- a/test/MSVS/vs-8.0-files.py +++ b/test/MSVS/vs-8.0-files.py @@ -33,9 +33,9 @@ import os import os.path import sys -import TestSCons +import TestSConsMSVS -test = TestSCons.TestSCons() +test = TestSConsMSVS.TestSConsMSVS() # Make the test infrastructure think we have this version of MSVS installed. test._msvs_versions = ['8.0'] @@ -212,7 +212,7 @@ test.must_not_exist(test.workpath('work1', 'Test.sln')) # Test that running SCons with $PYTHON_ROOT in the environment # changes the .vcproj output as expected. os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSCons.python)[1]) +python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) test.run(chdir='work1', arguments='Test.vcproj') |