diff options
| author | dirkbaechle <devnull@localhost> | 2012-09-06 23:16:49 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-09-06 23:16:49 (GMT) |
| commit | 299a549ae875c18748f395aca51068e27ac0d489 (patch) | |
| tree | 3d3613396456a717288d7b5e20f38eb5833c5698 /QMTest/TestCmdTests.py | |
| parent | 1c8744b6d4ec8812746415d1aae4f13e634809ca (diff) | |
| download | SCons-299a549ae875c18748f395aca51068e27ac0d489.zip SCons-299a549ae875c18748f395aca51068e27ac0d489.tar.gz SCons-299a549ae875c18748f395aca51068e27ac0d489.tar.bz2 | |
- added two new functions must_exist_one_of/must_not_exist_any_of to TestCmd,
supporting wildcards
- rewrote several test/packaging tests, using the new matching functions instead
of relying on the os.uname() machine value for determining the resulting RPM filename
- renamed glob modules in test/scons-time to avoid name clashes
- minor fix: added Java 1.7 as supported version to Tool/JavaCommon.py
Diffstat (limited to 'QMTest/TestCmdTests.py')
| -rw-r--r-- | QMTest/TestCmdTests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/QMTest/TestCmdTests.py b/QMTest/TestCmdTests.py index 357413f..1fe328c 100644 --- a/QMTest/TestCmdTests.py +++ b/QMTest/TestCmdTests.py @@ -551,8 +551,8 @@ result = TestCmd.TestCmd.context_diff(['a\\n', 'b\\n', 'c\\n', 'e\\n', 'f1\\n'], ['a\\n', 'c\\n', 'd\\n', 'e\\n', 'f2\\n']) result = list(result) expect = [ - '*** \\n', - '--- \\n', + '*** \\n', + '--- \\n', '***************\\n', '*** 1,5 ****\\n', ' a\\n', @@ -580,8 +580,8 @@ result = TestCmd.TestCmd.unified_diff(['a\\n', 'b\\n', 'c\\n', 'e\\n', 'f1\\n'], ['a\\n', 'c\\n', 'd\\n', 'e\\n', 'f2\\n']) result = list(result) expect = [ - '--- \\n', - '+++ \\n', + '--- \\n', + '+++ \\n', '@@ -1,5 +1,5 @@\\n', ' a\\n', '-b\\n', |