diff options
| author | Steven Knight <knight@baldmt.com> | 2004-08-30 05:04:22 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-08-30 05:04:22 (GMT) |
| commit | c1315083b2616e381a8ec5b73cab554a98eb54ae (patch) | |
| tree | b0de3a643b1bdc84d145595bd3bad218e9388dac /test | |
| parent | 43e7e59dc3885411c1c58c9c26c7adbc0e191e0a (diff) | |
| download | SCons-c1315083b2616e381a8ec5b73cab554a98eb54ae.zip SCons-c1315083b2616e381a8ec5b73cab554a98eb54ae.tar.gz SCons-c1315083b2616e381a8ec5b73cab554a98eb54ae.tar.bz2 | |
Test fixes: Win32 portability in Delete.py; fix a problem in msvs.py introduced by quoting Python executables; clean up temporary files/directories properly in SConfTests.py and UtilTests.py.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Delete.py | 4 | ||||
| -rw-r--r-- | test/msvs.py | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/test/Delete.py b/test/Delete.py index c57a810..138dc95 100644 --- a/test/Delete.py +++ b/test/Delete.py @@ -161,6 +161,8 @@ test.write('f14.in', "f14.in\n") test.run(status=2, stderr=None) -test.fail_test(string.find(test.stderr(), "No such file or directory") == -1) +stderr = test.stderr() +test.fail_test(string.find(stderr, "No such file or directory") == -1 and + string.find(stderr, "The system cannot find the path specified") == -1) test.pass_test() diff --git a/test/msvs.py b/test/msvs.py index fb41905..9dfd6f7 100644 --- a/test/msvs.py +++ b/test/msvs.py @@ -68,8 +68,8 @@ CFG=Test - Win32 Release # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "<WORKPATH>" # PROP BASE Intermediate_Dir "<WORKPATH>" -# PROP BASE Cmd_Line "<PYTHON> -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" -# PROP BASE Rebuild_Opt "-c && <PYTHON> -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" +# PROP BASE Cmd_Line ""<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" +# PROP BASE Rebuild_Opt "-c && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" # PROP BASE Target_File "<WORKPATH>\Test.exe" # PROP BASE Bsc_Name "" # PROP BASE Target_Dir "" @@ -77,8 +77,8 @@ CFG=Test - Win32 Release # PROP Use_Debug_Libraries 0 # PROP Output_Dir "<WORKPATH>" # PROP Intermediate_Dir "<WORKPATH>" -# PROP Cmd_Line "<PYTHON> -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" -# PROP Rebuild_Opt "-c && <PYTHON> -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" +# PROP Cmd_Line ""<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" +# PROP Rebuild_Opt "-c && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN>" -C <WORKPATH> -f SConstruct <WORKPATH>\Test.exe" # PROP Target_File "<WORKPATH>\Test.exe" # PROP Bsc_Name "" # PROP Target_Dir "" |