[commit: testsuite] master: Tweak the brokens list to include the directory the test is in (c6b5bd8)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c6b5bd8c8340b0307e751057e2c6166da746ec45

>---------------------------------------------------------------

commit c6b5bd8c8340b0307e751057e2c6166da746ec45
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Feb 11 17:36:40 2013 +0000

    Tweak the brokens list to include the directory the test is in

>---------------------------------------------------------------

 driver/runtests.py    |    2 +-
 driver/testglobals.py |    2 +-
 driver/testlib.py     |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/driver/runtests.py b/driver/runtests.py
index e1d6f7c..1b8ddb1 100644
--- a/driver/runtests.py
+++ b/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/driver/testglobals.py b/driver/testglobals.py
index b7b6007..a959557 100644
--- a/driver/testglobals.py
+++ b/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/driver/testlib.py b/driver/testlib.py
index 8a627f4..56e1b46 100644
--- a/driver/testlib.py
+++ b/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)