summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-10-09 22:43:28 (GMT)
committerSteven Knight <knight@baldmt.com>2005-10-09 22:43:28 (GMT)
commitaa8ee0923301d055ea4a595145cc71789e8b3f8d (patch)
tree60fb1eb955582f3da74f4157906e678ca60c6596 /test
parent435130568f78858e4d122c2ff2d1de7eb25feb80 (diff)
downloadSCons-aa8ee0923301d055ea4a595145cc71789e8b3f8d.zip
SCons-aa8ee0923301d055ea4a595145cc71789e8b3f8d.tar.gz
SCons-aa8ee0923301d055ea4a595145cc71789e8b3f8d.tar.bz2
Put quotes around the -C directory in command lines in MSVS project files.
Diffstat (limited to 'test')
-rw-r--r--test/MSVS/vs-6.0-exec.py13
-rw-r--r--test/MSVS/vs-6.0-files.py8
-rw-r--r--test/MSVS/vs-7.0-exec.py15
-rw-r--r--test/MSVS/vs-7.0-files.py6
-rw-r--r--test/MSVS/vs-7.1-exec.py15
-rw-r--r--test/MSVS/vs-7.1-files.py6
6 files changed, 36 insertions, 27 deletions
diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py
index 8f15bdc..a963772 100644
--- a/test/MSVS/vs-6.0-exec.py
+++ b/test/MSVS/vs-6.0-exec.py
@@ -59,7 +59,9 @@ exec(test.stdout())
-test.write('SConstruct', """\
+test.subdir('sub dir')
+
+test.write(['sub dir', 'SConstruct'], """\
env=Environment(MSVS_VERSION = '6.0')
env.MSVSProject(target = 'foo.dsp',
@@ -70,7 +72,7 @@ env.MSVSProject(target = 'foo.dsp',
env.Program('foo.c')
""")
-test.write('foo.c', r"""
+test.write(['sub dir', 'foo.c'], r"""
int
main(int argc, char *argv)
{
@@ -79,12 +81,13 @@ main(int argc, char *argv)
}
""")
-test.run(arguments='.')
+test.run(chdir='sub dir', arguments='.')
-test.run(program=['msdev'],
+test.run(chdir='sub dir',
+ program=['msdev'],
arguments=['Test.dsp', '/MAKE', 'foo - Win32 Release'])
-test.run(program=test.workpath('foo'), stdout="foo.c\n")
+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py
index e3f2994..135bb7f 100644
--- a/test/MSVS/vs-6.0-files.py
+++ b/test/MSVS/vs-6.0-files.py
@@ -77,8 +77,8 @@ CFG=Test - Win32 Release
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir ""
# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct Test.exe"
-# PROP BASE Rebuild_Opt "-c && echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct Test.exe"
+# PROP BASE Cmd_Line "echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C "<WORKPATH>" -f SConstruct Test.exe"
+# PROP BASE Rebuild_Opt "-c && echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C "<WORKPATH>" -f SConstruct Test.exe"
# PROP BASE Target_File "Test.exe"
# PROP BASE Bsc_Name ""
# PROP BASE Target_Dir ""
@@ -86,8 +86,8 @@ CFG=Test - Win32 Release
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
-# PROP Cmd_Line "echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct Test.exe"
-# PROP Rebuild_Opt "-c && echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct Test.exe"
+# PROP Cmd_Line "echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C "<WORKPATH>" -f SConstruct Test.exe"
+# PROP Rebuild_Opt "-c && echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C "<WORKPATH>" -f SConstruct Test.exe"
# PROP Target_File "Test.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py
index 0438434..8700d41 100644
--- a/test/MSVS/vs-7.0-exec.py
+++ b/test/MSVS/vs-7.0-exec.py
@@ -59,7 +59,9 @@ exec(test.stdout())
-test.write('SConstruct', """\
+test.subdir('sub dir')
+
+test.write(['sub dir', 'SConstruct'], """\
env=Environment(MSVS_VERSION = '7.0')
env.MSVSProject(target = 'foo.vcproj',
@@ -70,7 +72,7 @@ env.MSVSProject(target = 'foo.vcproj',
env.Program('foo.c')
""")
-test.write('foo.c', r"""
+test.write(['sub dir', 'foo.c'], r"""
int
main(int argc, char *argv)
{
@@ -79,14 +81,15 @@ main(int argc, char *argv)
}
""")
-test.run(arguments='.')
+test.run(chdir='sub dir', arguments='.')
-test.vcproj_sys_path('foo.vcproj')
+test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))
-test.run(program=['devenv'],
+test.run(chdir='sub dir',
+ program=['devenv'],
arguments=['foo.sln', '/build', 'Release'])
-test.run(program=test.workpath('foo'), stdout="foo.c\n")
+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index 409501d..0ab4870 100644
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -86,9 +86,9 @@ expected_vcprojfile = """\
\t\t\tATLMinimizesCRunTimeLibraryUsage="FALSE">
\t\t\t<Tool
\t\t\t\tName="VCNMakeTool"
-\t\t\t\tBuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct Test.exe"
-\t\t\t\tCleanCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct -c Test.exe"
-\t\t\t\tRebuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct Test.exe"
+\t\t\t\tBuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct Test.exe"
+\t\t\t\tCleanCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct -c Test.exe"
+\t\t\t\tRebuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct Test.exe"
\t\t\t\tOutput="Test.exe"/>
\t\t</Configuration>
\t</Configurations>
diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py
index f546aa5..ea886b2 100644
--- a/test/MSVS/vs-7.1-exec.py
+++ b/test/MSVS/vs-7.1-exec.py
@@ -59,7 +59,9 @@ exec(test.stdout())
-test.write('SConstruct', """\
+test.subdir('sub dir')
+
+test.write(['sub dir', 'SConstruct'], """\
env=Environment(MSVS_VERSION = '7.1')
env.MSVSProject(target = 'foo.vcproj',
@@ -70,7 +72,7 @@ env.MSVSProject(target = 'foo.vcproj',
env.Program('foo.c')
""")
-test.write('foo.c', r"""
+test.write(['sub dir', 'foo.c'], r"""
int
main(int argc, char *argv)
{
@@ -79,14 +81,15 @@ main(int argc, char *argv)
}
""")
-test.run(arguments='.')
+test.run(chdir='sub dir', arguments='.')
-test.vcproj_sys_path('foo.vcproj')
+test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))
-test.run(program=['devenv'],
+test.run(chdir='sub dir',
+ program=['devenv'],
arguments=['foo.sln', '/build', 'Release'])
-test.run(program=test.workpath('foo'), stdout="foo.c\n")
+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 9cbab12..d7ec165 100644
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -86,9 +86,9 @@ expected_vcprojfile = """\
\t\t\tATLMinimizesCRunTimeLibraryUsage="FALSE">
\t\t\t<Tool
\t\t\t\tName="VCNMakeTool"
-\t\t\t\tBuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct Test.exe"
-\t\t\t\tCleanCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct -c Test.exe"
-\t\t\t\tRebuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C <WORKPATH> -f SConstruct Test.exe"
+\t\t\t\tBuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct Test.exe"
+\t\t\t\tCleanCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct -c Test.exe"
+\t\t\t\tRebuildCommandLine="echo Starting SCons &amp;&amp; &quot;<PYTHON>&quot; -c &quot;<SCONS_SCRIPT_MAIN_XML>&quot; -C &quot;<WORKPATH>&quot; -f SConstruct Test.exe"
\t\t\t\tOutput="Test.exe"/>
\t\t</Configuration>
\t</Configurations>