diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-11 17:36:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-11 17:36:40 +0000 |
| commit | ac5ac465ebdc2f02f6d25c8ba31f38ecce59072d (patch) | |
| tree | 990fc48af4e54703d2959f683c5f65a0a7b8c7a2 /testsuite/driver | |
| parent | 39997e4da4000b1d0ea333f8d29313cf98d4df61 (diff) | |
| download | haskell-ac5ac465ebdc2f02f6d25c8ba31f38ecce59072d.tar.gz | |
Tweak the brokens list to include the directory the test is in
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/runtests.py | 2 | ||||
| -rw-r--r-- | testsuite/driver/testglobals.py | 2 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index e1d6f7cdb5..1b8ddb171a 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -258,7 +258,7 @@ if config.list_broken: global brokens print '' print 'Broken tests:' - print (' '.join(map (lambda (b, n) : '#' + str(b) + '(' + n + ')', brokens))) + print (' '.join(map (lambda (b, d, n) : '#' + str(b) + '(' + d + '/' + n + ')', brokens))) print '' if t.n_framework_failures != 0: diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index b7b60077f8..a9595570fc 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -265,7 +265,7 @@ class TestOptions: global default_testopts default_testopts = TestOptions() -# (bug, name) of tests marked broken +# (bug, directory, name) of tests marked broken global brokens brokens = [] diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 8a627f4771..56e1b4604c 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -151,19 +151,19 @@ def expect_broken( bug ): return lambda name, opts, b=bug: _expect_broken (name, opts, b ) def _expect_broken( name, opts, bug ): - record_broken(name, bug) + record_broken(name, opts, bug) opts.expect = 'fail'; def expect_broken_for( bug, ways ): return lambda name, opts, b=bug, w=ways: _expect_broken_for( name, opts, b, w ) def _expect_broken_for( name, opts, bug, ways ): - record_broken(name, bug) + record_broken(name, opts, bug) opts.expect_fail_for = ways -def record_broken(name, bug): +def record_broken(name, opts, bug): global brokens - me = (bug, name) + me = (bug, opts.testdir, name) if not me in brokens: brokens.append(me) |