Testsuite: delete dead code + cleanup

* Set config settings directly in mk/test.mk, instead of indirectly in
  config/ghc
* passing --hpcdir for WAY=hpc is unnecessary

6 files changed, 15 insertions, 29 deletions

diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index bf9fefdcba..2b35a0fa63 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -47,17 +47,12 @@ test('ffi007', omit_ways(['ghci']), compile_and_run, [''])
 test('ffi008', [exit_code(1), omit_ways(['ghci'])], compile_and_run, [''])
 
 # On i386, we need -msse2 to get reliable floating point results
-maybe_skip = normal
-opts = ''
 if config.platform.startswith('i386-'):
-    if version_ge(config.compiler_version, '6.13'):
-        opts = '-msse2'
-    else:
-        maybe_skip = only_ways(['ghci'])
-
-test('ffi009', [when(fast(), skip),
-                reqlib('random'),
-                maybe_skip] ,compile_and_run, [opts])
+    opts = '-msse2'
+else:
+    opts = ''
+
+test('ffi009', [when(fast(), skip), reqlib('random')], compile_and_run, [opts])
 
 test('ffi010', normal, compile_and_run, [''])
 test('ffi011', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout b/testsuite/tests/ghci/scripts/ghci024.stdout
index 4bbb556536..e224d806c7 100644
--- a/testsuite/tests/ghci/scripts/ghci024.stdout
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout
@@ -6,6 +6,7 @@ with the following modifiers:
   -XNondecreasingIndentation
 GHCi-specific dynamic flag settings:
 other dynamic, non-language, flag settings:
+  -fno-ghci-history
   -fimplicit-import-qualified
   -fshow-warning-groups
 warning settings:
diff --git a/testsuite/tests/hpc/all.T b/testsuite/tests/hpc/all.T
index 6757338274..5653fe49eb 100644
--- a/testsuite/tests/hpc/all.T
+++ b/testsuite/tests/hpc/all.T
@@ -13,7 +13,7 @@ setTestOpts(only_ways(['hpc']))
 def T2991(cmd):
   # The .mix file for the literate module should have non-zero entries.
   # The `grep` should exit with exit code 0.
-  return(cmd + " && grep -q cover_me .hpc.T2991/T2991LiterateModule.mix")
+  return(cmd + " && grep -q cover_me .hpc/T2991LiterateModule.mix")
 test('T2991', [cmd_wrapper(T2991), extra_clean(['T2991LiterateModule.hi',
                                                 'T2991LiterateModule.o'])],
               # Run with 'ghc --main'. Do not list other modules explicitly.
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index d1f05fd220..a7c7c84d1c 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -12,21 +12,17 @@ test('arith006', normal, compile_and_run, [''])
 test('arith007', normal, compile_and_run, [''])
 
 # On i386, we need -msse2 to get reliable floating point results
-ways = normal
-opts = ''
-if config.platform.startswith('i386-'):
-    if version_ge(config.compiler_version, '6.13'):
-        opts = '-msse2'
-    else:
-        ways = expect_fail_for(['optasm','threaded2','hpc','dyn','profasm'])
-
-test('arith008', ways, compile_and_run, [opts])
+if config.arch == 'i386':
+    opts = '-msse2'
+else:
+    opts = ''
+test('arith008', normal, compile_and_run, [opts])
 
 test('arith009', normal, compile_and_run, [''])
 test('arith010', normal, compile_and_run, [''])
 test('arith011', normal, compile_and_run, [''])
 
-test('arith012', ways, compile_and_run, [opts])
+test('arith012', normal, compile_and_run, [opts])
 
 test('arith013', normal, compile_and_run, [''])
 test('arith014', normal, compile_and_run, [''])
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index caa831efc6..f165c4a402 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -1,8 +1,4 @@
-def f(name, opts):
-    if (ghc_with_interpreter == 0):
-        opts.skip = 1
-
-setTestOpts(f)
+setTestOpts(req_interp)
 
 test('plugins01',
      [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins01 TOP={top}'),
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index bd59c4ee30..aa87241443 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -6,10 +6,8 @@
 
 def f(name, opts):
     opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
-    if (ghc_with_interpreter == 0):
-        opts.skip = 1
-
 setTestOpts(f)
+setTestOpts(req_interp)
 setTestOpts(only_ways(['normal','ghci']))
 
 test('TH_mkName', normal, compile, ['-v0'])