diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2012-12-16 17:56:16 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2012-12-16 17:56:16 (GMT) |
| commit | 78785a796c5cb080dc6a0e7bc99c720a349b3859 (patch) | |
| tree | 53e4be521ebf4c4f65c14c9e68b64b5327bf61c4 /test/scons-time | |
| parent | 1bf9aa83fc024950012dd76d110443fc2d30c92a (diff) | |
| download | SCons-78785a796c5cb080dc6a0e7bc99c720a349b3859.zip SCons-78785a796c5cb080dc6a0e7bc99c720a349b3859.tar.gz SCons-78785a796c5cb080dc6a0e7bc99c720a349b3859.tar.bz2 | |
- extended the must_contain* methods of the test framework, such that they all support user-defined find/search functions
- relaxed several of the regex comparisons for better cross-platform compatibility
Diffstat (limited to 'test/scons-time')
| -rw-r--r-- | test/scons-time/func/file.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/scons-time/func/file.py b/test/scons-time/func/file.py index fa9d36e..1fe3513 100644 --- a/test/scons-time/func/file.py +++ b/test/scons-time/func/file.py @@ -76,13 +76,13 @@ r"""set title "ST2.CONF TITLE" set key bottom left set label 3 "label 1.5" at 0.5,0.5 right set label 4 "label 1.6" at 0.6,0.4 right -plot '-' title "Startup" with lines lt 1, \ - '-' notitle with lines lt 7, \ - '-' title "label 1.5" with lines lt 7, \ +plot '-' title "Startup" with lines lt 1, \\ + '-' notitle with lines lt 7, \\ + '-' title "label 1.5" with lines lt 7, \\ '-' title "label 1.6" with lines lt 7 # Startup 1 0.000 -2 0.000 +2 0.\d* e 1.4 0 1.4 1 @@ -95,8 +95,9 @@ e e """ -test.run(arguments = 'func --file st2.conf --fmt gnuplot', stdout = expect2) +test.run(arguments = 'func --file st2.conf --fmt gnuplot') +test.must_contain_exactly_lines(test.stdout(), expect2, find=TestSCons.search_re_in_list) test.pass_test() |