diff options
| author | Steven Knight <knight@baldmt.com> | 2009-08-03 04:53:52 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-08-03 04:53:52 (GMT) |
| commit | 732a637fdd83714e9984ef1998764a696fe8c03b (patch) | |
| tree | a4ed59fa6956cfc2a9c4585ee862509ac9341ece /test/Clean | |
| parent | 2b91edeeb2f568f92036ff31190080732231c6e7 (diff) | |
| download | SCons-732a637fdd83714e9984ef1998764a696fe8c03b.zip SCons-732a637fdd83714e9984ef1998764a696fe8c03b.tar.gz SCons-732a637fdd83714e9984ef1998764a696fe8c03b.tar.bz2 | |
Solaris test portability fixes.
Diffstat (limited to 'test/Clean')
| -rw-r--r-- | test/Clean/mkfifo.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/test/Clean/mkfifo.py b/test/Clean/mkfifo.py index 4cdb8fa..0ef7662 100644 --- a/test/Clean/mkfifo.py +++ b/test/Clean/mkfifo.py @@ -48,13 +48,23 @@ test.run(arguments='-Q -q', stdout='Mkdir("testdir")\n') os.mkfifo('testdir/namedpipe') -expect = """\ +expect1 = """\ Mkdir("testdir") Path '%s' exists but isn't a file or directory. scons: Could not remove 'testdir': Directory not empty """ % os.path.join('testdir', 'namedpipe') -test.run(arguments='-c -Q -q', stdout=expect) +expect2 = """\ +Mkdir("testdir") +Path '%s' exists but isn't a file or directory. +scons: Could not remove 'testdir': File exists +""" % os.path.join('testdir', 'namedpipe') + +test.run(arguments='-c -Q -q') + +if test.stdout() not in [expect1, expect2]: + test.diff(expect1, test.stdout(), 'STDOUT ') + test.fail_test() test.must_exist(test.workpath('testdir/namedpipe')) |