diff options
| author | Steven Knight <knight@baldmt.com> | 2006-02-25 18:18:55 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-02-25 18:18:55 (GMT) |
| commit | c32fd05c5b00b7658c8459c54bb7df37fd890284 (patch) | |
| tree | 4c3768750f3780254d151018eeeba54faaedf1d9 /test | |
| parent | 40bbc04d482ed19b5ae7593acb4b5afaa76520c3 (diff) | |
| download | SCons-c32fd05c5b00b7658c8459c54bb7df37fd890284.zip SCons-c32fd05c5b00b7658c8459c54bb7df37fd890284.tar.gz SCons-c32fd05c5b00b7658c8459c54bb7df37fd890284.tar.bz2 | |
In the error message, supply the file name that triggered on IOError or OSError, not just the target name.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Install/Install.py | 7 | ||||
| -rw-r--r-- | test/build-errors.py | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/Install/Install.py b/test/Install/Install.py index 50f3820..7018466 100644 --- a/test/Install/Install.py +++ b/test/Install/Install.py @@ -128,9 +128,14 @@ test.write(['work', 'f1.in'], "f1.in again again\n") os.chmod(test.workpath('work', 'export'), 0555) f = open(f1_out, 'rb') +expect = """\ +scons: *** [%s] %s: Permission denied +""" % (os.path.join('export', 'f1.out'), + test.workpath('work', 'export', 'f1.out')) + test.run(chdir = 'work', arguments = f1_out, - stderr="scons: *** [%s] Permission denied\n" % os.path.join('export', 'f1.out'), + stderr=expect, status=2) f.close() diff --git a/test/build-errors.py b/test/build-errors.py index 9b6443d..e25fbd5 100644 --- a/test/build-errors.py +++ b/test/build-errors.py @@ -215,8 +215,8 @@ test.writable('test2.out', 1) test.description_set("Incorrect STDERR:\n%s" % test.stderr()) errs = [ - "scons: *** [test2.out] Permission denied\n", - "scons: *** [test2.out] permission denied\n", + "scons: *** [test2.out] test2.out: Permission denied\n", + "scons: *** [test2.out] test2.out: permission denied\n", ] test.fail_test(test.stderr() not in errs) |