From a9b01c08aab02a8f00cbaf49a99eff0a7b0d19e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= <omeragacan@gmail.com> Date: Tue, 19 Jun 2018 10:16:54 +0300 Subject: [PATCH] Mark some TH tests as req_interp - dataToExpQUnit - qq005 - qq006 - qq007 - qq008 - qq009 - T13949 - T8025 --- libraries/template-haskell/tests/all.T | 2 +- testsuite/tests/quasiquotation/qq005/test.T | 3 ++- testsuite/tests/quasiquotation/qq006/test.T | 3 ++- testsuite/tests/quasiquotation/qq007/test.T | 3 ++- testsuite/tests/quasiquotation/qq008/test.T | 3 ++- testsuite/tests/quasiquotation/qq009/test.T | 3 ++- testsuite/tests/th/should_compile/T13949/all.T | 4 ++-- testsuite/tests/th/should_compile/T8025/all.T | 4 ++-- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libraries/template-haskell/tests/all.T b/libraries/template-haskell/tests/all.T index 716742a20ca6..1d48d411d063 100644 --- a/libraries/template-haskell/tests/all.T +++ b/libraries/template-haskell/tests/all.T @@ -1,2 +1,2 @@ # difficult to test TH with profiling, because we have to build twice -test('dataToExpQUnit', omit_ways(prof_ways), compile, ['-v0']) +test('dataToExpQUnit', [omit_ways(prof_ways), req_interp], compile, ['-v0']) diff --git a/testsuite/tests/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T index 4e381380a858..6e7ec8d14cc3 100644 --- a/testsuite/tests/quasiquotation/qq005/test.T +++ b/testsuite/tests/quasiquotation/qq005/test.T @@ -5,6 +5,7 @@ test('qq005', # profiling ways, due to the TH use, so for now we just # omit the profiling ways omit_ways(prof_ways), - extra_clean(['Expr.hi', 'Expr.o', 'Main.hi', 'Main.o'])], + extra_clean(['Expr.hi', 'Expr.o', 'Main.hi', 'Main.o']), + req_interp], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T index a76cd7064fb7..13e6530753fc 100644 --- a/testsuite/tests/quasiquotation/qq006/test.T +++ b/testsuite/tests/quasiquotation/qq006/test.T @@ -1,3 +1,4 @@ test('qq006', [extra_files(['Expr.hs', 'Main.hs']), - when(fast(), skip)], multimod_compile_fail, + when(fast(), skip), + req_interp], multimod_compile_fail, ['Main', '-v0']) diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T index edb355419094..7e8251a65766 100644 --- a/testsuite/tests/quasiquotation/qq007/test.T +++ b/testsuite/tests/quasiquotation/qq007/test.T @@ -1,5 +1,6 @@ test('qq007', [extra_files(['QQ.hs', 'Test.hs']), when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), - omit_ways(prof_ways)], + omit_ways(prof_ways), + req_interp], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T index 9d83f34907a9..d17ce0deb5b6 100644 --- a/testsuite/tests/quasiquotation/qq008/test.T +++ b/testsuite/tests/quasiquotation/qq008/test.T @@ -1,5 +1,6 @@ test('qq008', [extra_files(['QQ.hs', 'Test.hs']), when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), - omit_ways(prof_ways)], + omit_ways(prof_ways), + req_interp], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) diff --git a/testsuite/tests/quasiquotation/qq009/test.T b/testsuite/tests/quasiquotation/qq009/test.T index 1f108a626e0f..2dfb976298fa 100644 --- a/testsuite/tests/quasiquotation/qq009/test.T +++ b/testsuite/tests/quasiquotation/qq009/test.T @@ -1,5 +1,6 @@ test('qq009', [extra_files(['QQ.hs', 'Test.hs']), when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), - omit_ways(prof_ways)], + omit_ways(prof_ways), + req_interp], multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags]) diff --git a/testsuite/tests/th/should_compile/T13949/all.T b/testsuite/tests/th/should_compile/T13949/all.T index 193b06f67dc3..edd3fe5c9fa0 100644 --- a/testsuite/tests/th/should_compile/T13949/all.T +++ b/testsuite/tests/th/should_compile/T13949/all.T @@ -7,6 +7,6 @@ # (1) Use -fexternal-interpreter, or # (2) Build the program twice: once with -dynamic, and then # with -prof using -osuf to set a different object file suffix. -test('T13949', [extra_files(['ASCII.hs', 'PatternGenerator.hs', 'These.hs', 'Tree.hs']), +test('T13949', [extra_files(['ASCII.hs', 'PatternGenerator.hs', 'These.hs', 'Tree.hs']), req_interp, omit_ways(['profasm'])], - multimod_compile, ['ASCII PatternGenerator These Tree', '-fno-code -v0']) \ No newline at end of file + multimod_compile, ['ASCII PatternGenerator These Tree', '-fno-code -v0']) diff --git a/testsuite/tests/th/should_compile/T8025/all.T b/testsuite/tests/th/should_compile/T8025/all.T index 2eb42ac740e9..4cdf19cae8eb 100644 --- a/testsuite/tests/th/should_compile/T8025/all.T +++ b/testsuite/tests/th/should_compile/T8025/all.T @@ -5,5 +5,5 @@ # (1) Use -fexternal-interpreter, or # (2) Build the program twice: once with -dynamic, and then # with -prof using -osuf to set a different object file suffix. -test('T8025', [extra_files(['A.hs', 'B.hs']), omit_ways(['profasm'])], - multimod_compile, ['A B', '-fno-code -v0']) \ No newline at end of file +test('T8025', [extra_files(['A.hs', 'B.hs']), omit_ways(['profasm']), req_interp], + multimod_compile, ['A B', '-fno-code -v0']) -- GitLab