diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-04-07 19:03:57 -0400 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-04-07 19:03:57 -0400 |
| commit | b77237331643b82eea7365372379f56e5b494b24 (patch) | |
| tree | a068e53380c92bfe47afeb39d217c4fe93c68970 /QMTest | |
| parent | 688a4aac959f6b481bf77cb2278b1accbfe24b14 (diff) | |
| parent | f25c4b4c536ee8bc380165563c79a0e0f2cbded4 (diff) | |
| download | scons-b77237331643b82eea7365372379f56e5b494b24.tar.gz | |
Merged in garyo/scons (pull request #18)
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSConsMSVS.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 27cfcb89..4f04a486 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -33,7 +33,7 @@ from TestCommon import __all__ default_version = '2.1.0.alpha.yyyymmdd' -copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 4, 0) diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py index 604f1915..1cff81d6 100644 --- a/QMTest/TestSConsMSVS.py +++ b/QMTest/TestSConsMSVS.py @@ -710,7 +710,7 @@ expected_vcprojfile_10_0 = """\ \t\t<NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> \t</PropertyGroup> \t<ItemGroup> -\t\t<ClInclude Include="sdk.h" /> +\t\t<ClInclude Include="sdk_dir\sdk.h" /> \t</ItemGroup> \t<ItemGroup> \t\t<ClInclude Include="test.h" /> @@ -787,7 +787,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', HOST_ARCH='%(HOST_ARCH)s') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] |