Skip some more tests when the compiler is profiled

testsuite/config/ghc

@@ -136,6 +136,7 @@ def get_compiler_info():
 
     if re.match(".*_p(_.*|$)", rtsInfoDict["RTS way"]):
         config.compiler_profiled = True
+        config.run_ways = filter(lambda x: x != 'ghci', config.run_ways)
     else:
         config.compiler_profiled = False
 

testsuite/tests/ghc-regress/annotations/should_compile/all.T

 
+setTestOpts(if_compiler_profiled(skip))
+
 # Annotations, like Template Haskell, require runtime evaluation.  In
 # order for this to work with profiling, we would have to build the
 # program twice and use -osuf p_o (see the TH_splitE5_prof test).  For

testsuite/tests/ghc-regress/annotations/should_run/all.T

+setTestOpts(if_compiler_profiled(skip))
 # These tests are very slow due to their use of package GHC
 setTestOpts(skip_if_fast)
 

testsuite/tests/ghc-regress/ghc-e/should_run/all.T

 
+setTestOpts(if_compiler_profiled(skip))
+
 test('ghc-e001', normal, run_command, ['$MAKE --no-print-directory -s ghc-e001'])
 test('ghc-e002', normal, run_command, ['$MAKE --no-print-directory -s ghc-e002'])
 test('ghc-e003', normal, run_command, ['$MAKE --no-print-directory -s ghc-e003'])

testsuite/tests/ghc-regress/ghci/should_run/all.T

+
+setTestOpts(if_compiler_profiled(skip))
+
 # We only want to run these tests with GHCi
 def just_ghci( opts ):
   opts.only_ways = ['ghci']

testsuite/tests/ghc-regress/layout/all.T

@@ -37,7 +37,8 @@ test('layout006',
 
 test('layout007',
      [extra_clean(['layout007.hi', 'layout007.o']),
-      only_compiler_types(['ghc'])],
+      only_compiler_types(['ghc']),
+      if_compiler_profiled(skip)],
      run_command,
      ['$MAKE -s --no-print-directory layout007'])
 

testsuite/tests/ghc-regress/typecheck/should_compile/all.T

@@ -302,7 +302,8 @@ test('T3342', normal, compile, [''])
 test('T3346', normal, compile, [''])
 # This is a TH test, which would require extra magic to make it work with
 # profiling (see th/all.T).
-test('T3391', omit_ways(['profc','profasm']), compile, [''])
+test('T3391', [omit_ways(['profc','profasm']), if_compiler_profiled(skip)],
+              compile, [''])
 test('T3409', normal, compile, [''])
 test('T3955', normal, compile, [''])
 test('PolyRec', normal, compile, [''])