diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-21 19:37:35 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-21 19:37:35 +0000 |
| commit | 497c9b4495374319bd389fbc2962de72f7787506 (patch) | |
| tree | 5b88bc1bd64ace07d30362d61348778a2f5877f5 /test/Interactive | |
| parent | 2331243e13d0023bf6462b6bb4abe523a4358e09 (diff) | |
| download | scons-497c9b4495374319bd389fbc2962de72f7787506.tar.gz | |
Remove leftover "shell pwd" debug statement.
Update error messages now that the Windows cmd interpreter is looking
for the shell-out executables.
Diffstat (limited to 'test/Interactive')
| -rw-r--r-- | test/Interactive/shell.py | 8 | ||||
| -rw-r--r-- | test/Interactive/variant_dir.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py index 9d5e8a2d..5b35f87e 100644 --- a/test/Interactive/shell.py +++ b/test/Interactive/shell.py @@ -84,9 +84,9 @@ scons.send("build foo.out\n") scons.send("\n") if sys.platform == 'win32': - no_such_error = 'The system cannot find the file specified' + no_such_error = "'no_such_command' is not recognized as an internal or external command,\noperable program or batch file." else: - no_such_error = 'No such file or directory' + no_such_error = 'scons: no_such_command: No such file or directory' expect_stdout = """\ scons>>> Copy("foo.out", "foo.in") @@ -100,9 +100,9 @@ hello from shell_command.py scons>>> hello from shell_command.py scons>>> sh %(_python_)s %(_shell_command_py_)s hello from shell_command.py -scons>>> scons: no_such_command: %(no_such_error)s +scons>>> %(no_such_error)s scons>>> !no_such_command arg1 arg2 -scons: no_such_command: %(no_such_error)s +%(no_such_error)s scons>>> scons: `foo.out' is up to date. scons>>> build foo.out scons: `foo.out' is up to date. diff --git a/test/Interactive/variant_dir.py b/test/Interactive/variant_dir.py index 7de25cc9..68ee2a32 100644 --- a/test/Interactive/variant_dir.py +++ b/test/Interactive/variant_dir.py @@ -76,8 +76,6 @@ import os os.chdir('work/sub1') scons = test.start(chdir = 'work/sub1', arguments = '-Q -u --interactive') -scons.send("shell pwd\n") - scons.send("build\n") scons.send("build %s\n" % marker_1) |