Add if_compiler_debugged to testsuite driver

arrowfail001 currently fails only when DEBUG is defined.

testsuite/config/ghc

@@ -35,6 +35,8 @@ if (ghc_with_native_codegen == 1):
     config.compile_ways.append('optasm')
     config.run_ways.append('optasm')
 
+config.compiler_debugged = ghc_debugged
+
 if (ghc_with_vanilla == 1):
     config.have_vanilla = True
 

testsuite/driver/testlib.py

@@ -420,6 +420,12 @@ def if_compiler_ge( compiler, version, f ):
     else:
         return normal
 
+def if_compiler_debugged( f ):
+    if config.compiler_debugged:
+        return f
+    else:
+        return normal
+
 def namebase( nb ):
    return lambda opts, nb=nb: _namebase(opts, nb)
 

testsuite/mk/ghc-config.hs

@@ -17,6 +17,7 @@ main = do
   let fields = read info :: [(String,String)]
 
   getGhcFieldOrFail fields "GhcStage" "Stage"
+  getGhcFieldOrFail fields "GhcDebugged" "Debug on"
   getGhcFieldOrFail fields "GhcWithNativeCodeGen" "Have native code generator"
   getGhcFieldOrFail fields "GhcWithInterpreter" "Have interpreter"
   getGhcFieldOrFail fields "GhcUnregisterised" "Unregisterised"

testsuite/mk/test.mk

@@ -39,6 +39,8 @@ endif
 
 RUNTEST_OPTS += -e ghc_compiler_always_flags="'$(TEST_HC_OPTS)'"
 
+RUNTEST_OPTS += -e ghc_debugged=$(GhcDebugged)
+
 ifeq "$(GhcWithNativeCodeGen)" "YES"
 RUNTEST_OPTS += -e ghc_with_native_codegen=1
 else

testsuite/tests/arrows/should_fail/all.T

 setTestOpts(only_compiler_types(['ghc']))
 
-test('arrowfail001', expect_broken(5267), compile_fail, [''])
+test('arrowfail001',
+     if_compiler_debugged(expect_broken(5267)),
+     compile_fail,
+     [''])
  # arrowfail001 gets an ASSERT error in the stage1 compiler
  # because we simply are not typechecking arrow commands
  # correcly.  See Trac #5267, #5609, #5605