diff options
Diffstat (limited to 'test/SetContentSignatureType.py')
| -rw-r--r-- | test/SetContentSignatureType.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/test/SetContentSignatureType.py b/test/SetContentSignatureType.py index 7f161fe..586d55b 100644 --- a/test/SetContentSignatureType.py +++ b/test/SetContentSignatureType.py @@ -62,9 +62,9 @@ test.run(arguments = 'f1.out f3.out', test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = test.wrap_stdout("""\ -scons: "f1.out" is up to date. +scons: `f1.out' is up to date. build("f2.out", "f2.in") -scons: "f3.out" is up to date. +scons: `f3.out' is up to date. build("f4.out", "f4.in") """), stderr = warning%11) @@ -79,9 +79,9 @@ os.utime(test.workpath('f3.in'), test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = test.wrap_stdout("""\ build("f1.out", "f1.in") -scons: "f2.out" is up to date. +scons: `f2.out' is up to date. build("f3.out", "f3.in") -scons: "f4.out" is up to date. +scons: `f4.out' is up to date. """), stderr = warning%11) @@ -108,9 +108,9 @@ test.run(arguments = 'f1.out f3.out', test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = test.wrap_stdout("""\ -scons: "f1.out" is up to date. +scons: `f1.out' is up to date. build("f2.out", "f2.in") -scons: "f3.out" is up to date. +scons: `f3.out' is up to date. build("f4.out", "f4.in") """), stderr = warning%11) @@ -123,7 +123,12 @@ os.utime(test.workpath('f3.in'), os.path.getmtime(test.workpath('f3.in'))+10)) test.run(arguments = 'f1.out f2.out f3.out f4.out', - stdout = test.wrap_stdout('scons: "f1.out" is up to date.\nscons: "f2.out" is up to date.\nscons: "f3.out" is up to date.\nscons: "f4.out" is up to date.\n'), + stdout = test.wrap_stdout("""\ +scons: `f1.out' is up to date. +scons: `f2.out' is up to date. +scons: `f3.out' is up to date. +scons: `f4.out' is up to date. +"""), stderr = warning%11) test.write('SConstruct', """ @@ -137,13 +142,7 @@ env.B(target = 'f3.out', source = 'f3.in') env.B(target = 'f4.out', source = 'f4.in') """) -test.run(arguments = 'f1.out f2.out f3.out f4.out', - stdout = test.wrap_stdout("""\ -scons: "f1.out" is up to date. -scons: "f2.out" is up to date. -scons: "f3.out" is up to date. -scons: "f4.out" is up to date. -""")) +test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out') test.pass_test() |