[commit: ghc] master: Run all TH tests with -fexternal-interpreter (#12219) (d2006d0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d2006d050e7a9111c0c448d6262f8994ef5761b7/ghc

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

commit d2006d050e7a9111c0c448d6262f8994ef5761b7
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jun 22 13:47:36 2016 +0100

    Run all TH tests with -fexternal-interpreter (#12219)


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

d2006d050e7a9111c0c448d6262f8994ef5761b7
 testsuite/config/ghc     |  5 ++++-
 testsuite/tests/th/all.T | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index aa6b047..68d4a64 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -29,7 +29,8 @@ config.other_ways         = ['prof', 'normal_h',
                              'llvm', 'debugllvm',
                              'profllvm', 'profoptllvm', 'profthreadedllvm',
                              'debug',
-                             'ghci-ext']
+                             'ghci-ext',
+                             'ext-interp']
 
 if (ghc_with_native_codegen == 1):
     config.compile_ways.append('optasm')
@@ -96,6 +97,7 @@ config.way_flags = {
     'profoptllvm'      : ['-O', '-prof', '-static', '-fprof-auto', '-fllvm'],
     'profthreadedllvm' : ['-O', '-prof', '-static', '-fprof-auto', '-threaded', '-fllvm'],
     'ghci-ext'         : ['--interactive', '-v0', '-ignore-dot-ghci', '-fno-ghci-history', '-fexternal-interpreter', '+RTS', '-I0.1', '-RTS'],
+    'ext-interp' : ['-fexternal-interpreter'],
    }
 
 config.way_rts_flags = {
@@ -130,6 +132,7 @@ config.way_rts_flags = {
     'profoptllvm'      : ['-hc', '-p'],
     'profthreadedllvm' : ['-p'],
     'ghci-ext'         : [],
+    'ext-interp'       : [],
    }
 
 # Useful classes of ways that can be used with only_ways(), omit_ways() and
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index aa87241..77be4b7 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -8,7 +8,9 @@ def f(name, opts):
     opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
 setTestOpts(f)
 setTestOpts(req_interp)
-setTestOpts(only_ways(['normal','ghci']))
+# TH should work with -fexternal-interpreter too
+setTestOpts(extra_ways(['ext-interp']))
+setTestOpts(only_ways(['normal','ghci','ext-interp']))
 
 test('TH_mkName', normal, compile, ['-v0'])
 test('TH_1tuple', normal, compile_fail, ['-v0'])
@@ -129,7 +131,7 @@ test('TH_scopedTvs', normal, compile, ['-v0'])
 
 test('TH_runIO', normal, compile_fail, ['-v0'])
 
-test('TH_ghci1', normal, ghci_script, ['TH_ghci1.script'])
+test('TH_ghci1', only_ways(['ghci']), ghci_script, ['TH_ghci1.script'])
 
 test('TH_linePragma', normal, compile_fail, ['-v0'])
 
@@ -259,7 +261,8 @@ test('T7064',
 test('T7092', extra_clean(['T7092a.hi','T7092a.o']),
               multimod_compile, ['T7092', '-v0 ' + config.ghc_th_way_flags])
 test('T7276', normal, compile_fail, ['-v0'])
-test('T7276a', combined_output, ghci_script, ['T7276a.script'])
+test('T7276a', [ only_ways(['ghci']), combined_output ],
+               ghci_script, ['T7276a.script'])
 
 test('TH_TyInstWhere1', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
 test('TH_TyInstWhere2', normal, compile, ['-v0'])
@@ -272,7 +275,7 @@ test('T7532',
      multimod_compile,
      ['T7532', '-v0 ' + config.ghc_th_way_flags])
 test('T2222', normal, compile, ['-v0'])
-test('T1849', normal, ghci_script, ['T1849.script'])
+test('T1849', only_ways(['ghci']), ghci_script, ['T1849.script'])
 test('T7681', normal, compile, ['-v0'])
 test('T7910', normal, compile_and_run, ['-v0'])
 
@@ -317,7 +320,7 @@ test('T8577',
      extra_clean(['T8577a.hi', 'T8577a.o']),
      multimod_compile_fail,
      ['T8577', '-v0 ' + config.ghc_th_way_flags])
-test('T8625', normal, ghci_script, ['T8625.script'])
+test('T8625', only_ways(['ghci']), ghci_script, ['T8625.script'])
 test('TH_StaticPointers', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
      compile_and_run, [''])
 test('TH_StaticPointers02', [], compile_fail, [''])
@@ -348,8 +351,8 @@ test('T1476b', normal, compile, ['-v0'])
 test('T8031', normal, compile, ['-v0'])
 test('T8624', normal, run_command, ['$MAKE -s --no-print-directory T8624'])
 test('TH_Lift', normal, compile, ['-v0'])
-test('T10047', normal, ghci_script, ['T10047.script'])
-test('T10019', normal, ghci_script, ['T10019.script'])
+test('T10047', only_ways(['ghci']), ghci_script, ['T10047.script'])
+test('T10019', only_ways(['ghci']), ghci_script, ['T10019.script'])
 test('T10267', extra_clean(['T10267a.hi', 'T10267a.o']),
                multimod_compile_fail,
                ['T10267', '-dsuppress-uniques -v0 ' + config.ghc_th_way_flags])