diff options
26 files changed, 107 insertions, 66 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index da7cc3a2af..e8fbcc9b32 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -70,6 +70,8 @@ else: if (ghc_with_dynamic_rts == 1): config.run_ways.append('dyn') +config.ghc_dynamic = ghc_dynamic + if (ghc_with_profiling == 1 and ghc_with_threaded_rts == 1): config.run_ways.append('profthreaded') @@ -200,3 +202,15 @@ def get_compiler_info(): except: config.package_conf_cache_file = '' + if compilerInfoDict["GHC Dynamic"] == "YES": + config.ghc_th_way_flags = "-dynamic" + config.ghci_way_flags = "-dynamic" + config.ghc_th_way = "dyn" + config.ghc_plugin_way = "dyn" + elif compilerInfoDict["GHC Dynamic"] == "NO": + config.ghc_th_way_flags = "-static" + config.ghci_way_flags = "-static" + config.ghc_plugin_way = "normal" + else: + raise 'Bad value for "GHC Dynamic"' + diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 66987a1f59..cde55f32c9 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -308,7 +308,7 @@ def doing_ghci(): return 'ghci' in config.run_ways def ghci_dynamic( ): - return config.ghc_dynamic_by_default + return config.ghc_dynamic def fast(): return config.fast diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index f9ed52ee0f..e5bf164391 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -164,6 +164,16 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" include $(ghc-config-mk) endif +ifeq "$(GhcDynamic)" "YES" +ghcThWayFlags = -dynamic +ghciWayFlags = -dynamic +ghcPluginWayFlags = -dynamic +else +ghcThWayFlags = -static +ghciWayFlags = -static +ghcPluginWayFlags = -static +endif + # ----------------------------------------------------------------------------- ifeq "$(HostOS)" "mingw32" diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index 3145488904..2a229a7580 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -24,6 +24,7 @@ main = do getGhcFieldOrFail fields "GhcWithSMP" "Support SMP" getGhcFieldOrFail fields "GhcRTSWays" "RTS ways" getGhcFieldOrDefault fields "GhcDynamicByDefault" "Dynamic by default" "NO" + getGhcFieldOrDefault fields "GhcDynamic" "GHC Dynamic" "NO" getGhcFieldProgWithDefault fields "AR" "ar command" "ar" let pkgdb_flag = case lookup "Project version" fields of diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index e7604bdd7d..3ba6f74e9c 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -104,6 +104,14 @@ RUNTEST_OPTS += -e ghc_dynamic_by_default=False CABAL_MINIMAL_BUILD = --enable-library-vanilla --disable-shared endif +ifeq "$(GhcDynamic)" "YES" +RUNTEST_OPTS += -e ghc_dynamic=True +CABAL_PLUGIN_BUILD = --enable-shared --disable-library-vanilla +else +RUNTEST_OPTS += -e ghc_dynamic=False +CABAL_PLUGIN_BUILD = --enable-library-vanilla --disable-shared +endif + ifeq "$(GhcWithSMP)" "YES" RUNTEST_OPTS += -e ghc_with_smp=1 else diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index 2a06257cf4..f87e89f1fd 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -486,9 +486,9 @@ T3364: .PHONY: T706 T706: cp T706a.hs T706.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T706.hs + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs cp T706b.hs T706.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T706.hs + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive -ignore-dot-ghci -v0 T706 .PHONY: T5584 diff --git a/testsuite/tests/driver/recomp009/Makefile b/testsuite/tests/driver/recomp009/Makefile index 1fb2bd116b..674c541a5a 100644 --- a/testsuite/tests/driver/recomp009/Makefile +++ b/testsuite/tests/driver/recomp009/Makefile @@ -18,9 +18,9 @@ clean: recomp009: clean cp Sub1.hs Sub.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) $(ghcThWayFlags) -v0 --make Main.hs ./Main sleep 1 cp Sub2.hs Sub.hs - -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make Main.hs + -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) $(ghcThWayFlags) -v0 --make Main.hs ./Main diff --git a/testsuite/tests/ffi/should_run/Makefile b/testsuite/tests/ffi/should_run/Makefile index 7f846ce53d..12e51b26ec 100644 --- a/testsuite/tests/ffi/should_run/Makefile +++ b/testsuite/tests/ffi/should_run/Makefile @@ -6,10 +6,10 @@ ffi018_ghci_setup : '$(TEST_HC)' $(TEST_HC_OPTS) -c ffi018_ghci_c.c T1288_ghci_setup : - '$(TEST_HC)' $(TEST_HC_OPTS) -c T1288_ghci_c.c + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -c T1288_ghci_c.c T2276_ghci_setup : - '$(TEST_HC)' $(TEST_HC_OPTS) -c T2276_ghci_c.c + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -c T2276_ghci_c.c ffi002_setup : '$(TEST_HC)' $(TEST_HC_OPTS) -c ffi002.hs diff --git a/testsuite/tests/ghc-api/dynCompileExpr/all.T b/testsuite/tests/ghc-api/dynCompileExpr/all.T index c6034eab6b..eaca3d8c58 100644 --- a/testsuite/tests/ghc-api/dynCompileExpr/all.T +++ b/testsuite/tests/ghc-api/dynCompileExpr/all.T @@ -2,4 +2,4 @@ test('dynCompileExpr', [ extra_run_opts('"' + config.libdir + '"'), when(opsys('mingw32'), expect_broken_for(5987, ['dyn'])), omit_ways(prof_ways) ], # cannot run interpreted code with -prof - compile_and_run, ['-package ghc']) + compile_and_run, ['-package ghc ' + config.ghci_way_flags]) diff --git a/testsuite/tests/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T index 4cd228344b..1ef3c0430c 100644 --- a/testsuite/tests/ghci/prog001/prog001.T +++ b/testsuite/tests/ghci/prog001/prog001.T @@ -1,4 +1,5 @@ test('prog001', - extra_clean(['C.hs', 'D.hs', 'D.hi', 'D.o']), + [extra_clean(['C.hs', 'D.hs', 'D.hi', 'D.o']), + cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)], ghci_script, ['prog001.script']) diff --git a/testsuite/tests/ghci/prog001/prog001.script b/testsuite/tests/ghci/prog001/prog001.script index b54335db45..c30f4fe735 100644 --- a/testsuite/tests/ghci/prog001/prog001.script +++ b/testsuite/tests/ghci/prog001/prog001.script @@ -26,13 +26,13 @@ main main -- compile D & reload -:shell "$HC" $HC_OPTS -fforce-recomp -c D.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c D.hs :reload main -- change D, recompile & reload :shell cp D2.hs D.hs -:shell "$HC" $HC_OPTS -fforce-recomp -c D.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c D.hs :reload :load A.hs diff --git a/testsuite/tests/ghci/prog002/prog002.T b/testsuite/tests/ghci/prog002/prog002.T index 19b90e49c2..1d6984b36f 100644 --- a/testsuite/tests/ghci/prog002/prog002.T +++ b/testsuite/tests/ghci/prog002/prog002.T @@ -1,3 +1,5 @@ -test('prog002', extra_clean(['A.hs', 'A.hi', 'A.o']), +test('prog002', + [extra_clean(['A.hs', 'A.hi', 'A.o']), + cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)], ghci_script, ['prog002.script']) diff --git a/testsuite/tests/ghci/prog002/prog002.script b/testsuite/tests/ghci/prog002/prog002.script index cecbe4091a..02d9362ca5 100644 --- a/testsuite/tests/ghci/prog002/prog002.script +++ b/testsuite/tests/ghci/prog002/prog002.script @@ -11,7 +11,7 @@ :load D.hs -- compile A & reload -:shell "$HC" $HC_OPTS -fforce-recomp -c A.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c A.hs :reload B.g 42 @@ -21,7 +21,7 @@ B.g 42 -- swap A2 for A, compile & reload :shell sleep 1 :shell cp A2.hs A.hs -:shell "$HC" $HC_OPTS -fforce-recomp -c A.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -fforce-recomp -c A.hs :reload -- the system should ignore the compiled version and compile its own. diff --git a/testsuite/tests/ghci/prog003/prog003.T b/testsuite/tests/ghci/prog003/prog003.T index 005811686a..f6dc38091f 100644 --- a/testsuite/tests/ghci/prog003/prog003.T +++ b/testsuite/tests/ghci/prog003/prog003.T @@ -1,6 +1,7 @@ test('prog003', - extra_clean(['D.hs', 'D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', - 'A', 'A.hi', 'A.o', 'a.out']), + [extra_clean(['D.hs', 'D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', + 'A', 'A.hi', 'A.o', 'a.out']), + cmd_prefix('ghciWayFlags=' + config.ghci_way_flags)], ghci_script, ['prog003.script']) diff --git a/testsuite/tests/ghci/prog003/prog003.script b/testsuite/tests/ghci/prog003/prog003.script index 9cdf484a59..66490a0dea 100644 --- a/testsuite/tests/ghci/prog003/prog003.script +++ b/testsuite/tests/ghci/prog003/prog003.script @@ -28,7 +28,7 @@ a 42 putStrLn "Run 3" -- compile D, check that :reload doesn't pick it up -:shell "$HC" $HC_OPTS -c D.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -c D.hs :reload :type (A.a,B.b,C.c,D.d) a 42 @@ -41,21 +41,21 @@ a 42 putStrLn "Run 5" -- D,C compiled -:shell "$HC" $HC_OPTS -c C.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -c C.hs :load A :type (A.a,B.b,C.c,D.d) a 42 putStrLn "Run 6" -- D,C,B compiled -:shell "$HC" $HC_OPTS -c B.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -c B.hs :load A :type (A.a,B.b,C.c,D.d) a 42 putStrLn "Run 7" -- D,C,B,A compiled -:shell "$HC" $HC_OPTS -c A.hs +:shell "$HC" $HC_OPTS $ghciWayFlags -c A.hs :load A :type (A.a,B.b,C.c,D.d) a 42 @@ -83,7 +83,7 @@ a 42 putStrLn "Run 11" -- A,B,C compiled (better not use A.o, B.o, C.o) -:shell "$HC" $HC_OPTS --make -v0 A +:shell "$HC" $HC_OPTS $ghciWayFlags --make -v0 A :shell rm D.o :load A :type (A.a,B.b,C.c,D.d) diff --git a/testsuite/tests/plugins/Makefile b/testsuite/tests/plugins/Makefile index ccabade439..ddbc7ebacf 100644 --- a/testsuite/tests/plugins/Makefile +++ b/testsuite/tests/plugins/Makefile @@ -5,6 +5,6 @@ include $(TOP)/mk/test.mk .PHONY: plugins01 plugins01: - "$(TEST_HC)" $(TEST_HC_OPTS) --make -v0 plugins01.hs -package-db simple-plugin/pkg.plugins01/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin + "$(TEST_HC)" $(TEST_HC_OPTS) $(ghcPluginWayFlags) --make -v0 plugins01.hs -package-db simple-plugin/pkg.plugins01/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin ./plugins01 diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T index 874fcdb408..b223d72df2 100644 --- a/testsuite/tests/plugins/all.T +++ b/testsuite/tests/plugins/all.T @@ -29,11 +29,11 @@ test('plugins04', test('plugins05', [ extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']), - expect_fail_for(['dyn'] + prof_ways) ], + only_ways([config.ghc_plugin_way]) ], multimod_compile_and_run, ['plugins05', '-package ghc']) test('plugins06', [ extra_clean(['LinkerTicklingPlugin.hi', 'LinkerTicklingPlugin.o']), - expect_fail_for(['dyn'] + prof_ways) ], + only_ways([config.ghc_plugin_way]) ], multimod_compile_and_run, ['plugins06', '-package ghc']) diff --git a/testsuite/tests/plugins/simple-plugin/Makefile b/testsuite/tests/plugins/simple-plugin/Makefile index e452f91374..17588bf3fb 100644 --- a/testsuite/tests/plugins/simple-plugin/Makefile +++ b/testsuite/tests/plugins/simple-plugin/Makefile @@ -15,6 +15,6 @@ package.%: echo "[]" > pkg.$*/local.package.conf - pkg.$*/setup configure --distdir pkg.$*/dist -v0 $(CABAL_MINIMAL_BUILD) --prefix="$(HERE)/pkg.$*/install" --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=pkg.$*/local.package.conf + pkg.$*/setup configure --distdir pkg.$*/dist -v0 $(CABAL_PLUGIN_BUILD) --prefix="$(HERE)/pkg.$*/install" --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=pkg.$*/local.package.conf pkg.$*/setup build --distdir pkg.$*/dist -v0 pkg.$*/setup install --distdir pkg.$*/dist -v0 diff --git a/testsuite/tests/polykinds/Makefile b/testsuite/tests/polykinds/Makefile index 0624646523..91439d93d6 100644 --- a/testsuite/tests/polykinds/Makefile +++ b/testsuite/tests/polykinds/Makefile @@ -24,9 +24,9 @@ T6054: T7022: $(RM) -f T7022.hi T7022.o T7022a.hi T7022a.o T7022b.hi T7022b.o - '$(TEST_HC)' $(TEST_HC_OPTS) -c T7022a.hs - '$(TEST_HC)' $(TEST_HC_OPTS) -c T7022b.hs -v0 - -'$(TEST_HC)' $(TEST_HC_OPTS) -c -v0 T7022.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -c T7022a.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -c T7022b.hs -v0 + -'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -c -v0 T7022.hs T7438: $(RM) -f T7438.hi T7438.o T7438a.hi T7438a.o diff --git a/testsuite/tests/quasiquotation/T4491/test.T b/testsuite/tests/quasiquotation/T4491/test.T index b62370aaef..a9ead0fa61 100644 --- a/testsuite/tests/quasiquotation/T4491/test.T +++ b/testsuite/tests/quasiquotation/T4491/test.T @@ -2,9 +2,9 @@ test('T4491', [ req_interp, # We'd need to jump through some hoops to run this test the - # in the prof or dyn ways, due to the TH use, so for now we just - # omit the other ways - omit_ways(['profasm','profthreaded','dyn']), + # other ways, due to the TH use, so for now we only run it + # the TH way + only_ways([config.ghc_th_way]), only_compiler_types(['ghc']), extra_clean(['A.hi', 'A.o']) ], diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 5d663d1260..ec5b8c9803 100644 --- a/testsuite/tests/rts/Makefile +++ b/testsuite/tests/rts/Makefile @@ -61,4 +61,4 @@ T7037: ./T7037_main T7040_ghci_setup : - '$(TEST_HC)' $(TEST_HC_OPTS) -c T7040_ghci_c.c + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghciWayFlags) -c T7040_ghci_c.c diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T index f8479b12c3..e2b5d1b656 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/all.T +++ b/testsuite/tests/safeHaskell/safeLanguage/all.T @@ -36,7 +36,7 @@ test('SafeLang11', extra_clean(['SafeLang11_A.o', 'SafeLang11_A.hi', 'SafeLang11_B.o', 'SafeLang11_B.hi'])], multimod_compile_and_run, - ['SafeLang11', '']) + ['SafeLang11', config.ghc_th_way_flags]) test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', '']) test('SafeLang13', extra_clean(['SafeLang13_A.o', 'SafeLang13_A.hi']), diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile index 37134ce5cd..f7f36652ce 100644 --- a/testsuite/tests/th/Makefile +++ b/testsuite/tests/th/Makefile @@ -5,12 +5,12 @@ include $(TOP)/mk/test.mk # Trac 2386 requires batch-compile not --make # Very important: without -O T2386: - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386_Lib.hs -fforce-recomp - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386.hs -fforce-recomp + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T2386_Lib.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T2386.hs T7445: - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T7445a.hs -fforce-recomp - '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T7445.hs -fforce-recomp + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T7445a.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T7445.hs HC_OPTS = -XTemplateHaskell -package template-haskell @@ -27,10 +27,10 @@ TH_Depends: $(RM) TH_Depends.o TH_Depends.hi $(RM) TH_Depends_External.o TH_Depends_External.hi echo "first run" > TH_Depends_external.txt - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 TH_Depends + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -v0 TH_Depends ./TH_Depends sleep 2 echo "second run" > TH_Depends_external.txt - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 TH_Depends + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -v0 TH_Depends ./TH_Depends diff --git a/testsuite/tests/th/T2014/Makefile b/testsuite/tests/th/T2014/Makefile index 72607a5886..0cdf67ae02 100644 --- a/testsuite/tests/th/T2014/Makefile +++ b/testsuite/tests/th/T2014/Makefile @@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk T2014 : - '$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs-boot - '$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs - '$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c B.hs - '$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c C.hs -v0 + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -fforce-recomp -c A.hs-boot + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -fforce-recomp -c A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -fforce-recomp -c B.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -fforce-recomp -c C.hs -v0 diff --git a/testsuite/tests/th/TH_spliceViewPat/test.T b/testsuite/tests/th/TH_spliceViewPat/test.T index 23b4f6a1b1..c08e7cb6f5 100644 --- a/testsuite/tests/th/TH_spliceViewPat/test.T +++ b/testsuite/tests/th/TH_spliceViewPat/test.T @@ -11,4 +11,4 @@ setTestOpts(when(compiler_profiled(), skip)) test('TH_spliceViewPat', extra_clean(['Main.o', 'Main.hi', 'A.o', 'A.hi']), multimod_compile_and_run, - ['Main', '']) + ['Main', config.ghc_th_way_flags]) diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T index fa185aa4ca..2af5cf8ca4 100644 --- a/testsuite/tests/th/all.T +++ b/testsuite/tests/th/all.T @@ -32,14 +32,14 @@ test('TH_repPatSig', normal, compile_fail, ['']) test('TH_spliceE5', extra_clean(['TH_spliceE5_Lib.hi', 'TH_spliceE5_Lib.o']), multimod_compile_and_run, - ['TH_spliceE5.hs', '-v0']) + ['TH_spliceE5.hs', '-v0 ' + config.ghc_th_way_flags]) test('TH_spliceE6', normal, compile, ['-v0']) test('TH_NestedSplices', extra_clean(['TH_NestedSplices_Lib.hi', 'TH_NestedSplices_Lib.o']), multimod_compile, - ['TH_NestedSplices.hs', '-v0']) + ['TH_NestedSplices.hs', '-v0 ' + config.ghc_th_way_flags]) # Testing profiling with TH is a bit tricky; we've already disabled # the prof way above, and also we want to add options specifically for @@ -57,7 +57,7 @@ test('TH_spliceE5_prof', test('TH_spliceD1', extra_clean(['TH_spliceD1_Lib.hi', 'TH_spliceD1_Lib.o']), multimod_compile_fail, - ['TH_spliceD1', '-v0']) + ['TH_spliceD1', '-v0 ' + config.ghc_th_way_flags]) test('TH_spliceD2', extra_clean(['TH_spliceD2_Lib.hi', 'TH_spliceD2_Lib.o']), @@ -78,21 +78,21 @@ test('TH_spliceDecl2', normal, compile, ['-v0']) test('TH_spliceDecl3', extra_clean(['TH_spliceDecl3_Lib.hi', 'TH_spliceDecl3_Lib.o']), multimod_compile, - ['TH_spliceDecl3', '-v0']) + ['TH_spliceDecl3', '-v0 ' + config.ghc_th_way_flags]) test('TH_spliceDecl4', extra_clean(['TH_spliceDecl4_Lib.hi', 'TH_spliceDecl4_Lib.o']), multimod_compile, - ['TH_spliceDecl4', '-v0']) + ['TH_spliceDecl4', '-v0 ' + config.ghc_th_way_flags]) test('T2597a', extra_clean(['T2597a_Lib.hi', 'T2597a_Lib.o']), multimod_compile, - ['T2597a', '-v0']) + ['T2597a', '-v0 ' + config.ghc_th_way_flags]) test('T2597b', extra_clean(['T2597b_Lib.hi', 'T2597b_Lib.o']), multimod_compile_fail, - ['T2597b', '-v0']) + ['T2597b', '-v0 ' + config.ghc_th_way_flags]) test('TH_spliceE1', normal, compile_and_run, ['']) test('TH_spliceExpr1', normal, compile, ['-v0']) @@ -108,7 +108,7 @@ test('TH_tuple1', normal, compile, ['-v0']) test('TH_genEx', extra_clean(['TH_genExLib.hi', 'TH_genExLib.o']), multimod_compile, - ['TH_genEx', '-v0']) + ['TH_genEx', '-v0 ' + config.ghc_th_way_flags]) test('TH_where', normal, compile_and_run, ['']) @@ -145,7 +145,7 @@ test('T2386', extra_clean(['T2386_Lib.hi', 'T2386_Lib.o']), ['$MAKE -s --no-print-directory T2386'] ) test('T2685', extra_clean(['T2685a.hi','T2685a.o']), - multimod_compile, ['T2685','-v0']) + multimod_compile, ['T2685', '-v0 ' + config.ghc_th_way_flags]) test('TH_sections', normal, compile, ['-v0']) @@ -167,10 +167,11 @@ test('T3100', normal, compile, ['-v0']) test('T3920', normal, compile_and_run, ['-v0']) test('T3600', extra_clean(['T3600a.hi','T3600a.o']), - multimod_compile, ['T3600','-v0']) + multimod_compile, ['T3600', '-v0 ' + config.ghc_th_way_flags]) test('T3845', normal, compile, ['-v0']) test('T3899', extra_clean(['T3899a.hi','T3899a.o']), - multimod_compile, ['T3899','-v0 -ddump-splices -dsuppress-uniques']) + multimod_compile, + ['T3899','-v0 -ddump-splices -dsuppress-uniques ' + config.ghc_th_way_flags]) test('T4056', normal, compile, ['-v0']) test('T4188', normal, compile, ['-v0']) test('T4233', normal, compile, ['-v0']) @@ -190,7 +191,7 @@ test('T5362', normal, compile, ['-v0']) test('TH_unresolvedInfix', extra_clean(['TH_unresolvedInfix_Lib.hi', 'TH_unresolvedInfix_Lib.o']), multimod_compile_and_run, - ['TH_unresolvedInfix.hs', '-v0']) + ['TH_unresolvedInfix.hs', '-v0 ' + config.ghc_th_way_flags]) test('TH_unresolvedInfix2', normal, compile_fail, @@ -203,10 +204,11 @@ test('T5410', normal, compile_and_run, ['-v0']) test('TH_lookupName', extra_clean(['TH_lookupName_Lib.hi', 'TH_lookupName_Lib.o']), multimod_compile_and_run, - ['TH_lookupName.hs', '']) + ['TH_lookupName.hs', config.ghc_th_way_flags]) test('T5452', normal, compile, ['-v0']) test('T5434', extra_clean(['T5434a.hi','T5434a.o']), - multimod_compile, ['T5434','-v0 -Wall']) + multimod_compile, + ['T5434','-v0 -Wall ' + config.ghc_th_way_flags]) test('T5508', normal, compile, ['-v0 -ddump-splices']) test('TH_Depends', [extra_clean(['TH_Depends_External.o', 'TH_Depends_External.hi', @@ -214,11 +216,12 @@ test('TH_Depends', run_command, ['$MAKE -s --no-print-directory TH_Depends']) test('T5597', extra_clean(['T5597a.hi','T5597a.o']), - multimod_compile, ['T5597','-v0']) + multimod_compile, ['T5597', '-v0 ' + config.ghc_th_way_flags]) test('T5665', extra_clean(['T5665a.hi','T5665a.o']), - multimod_compile, ['T5665','-v0']) + multimod_compile, ['T5665', '-v0 ' + config.ghc_th_way_flags]) test('T5700', extra_clean(['T5700a.hi','T5700a.o']), - multimod_compile, ['T5700','-v0 -ddump-splices']) + multimod_compile, + ['T5700','-v0 -ddump-splices ' + config.ghc_th_way_flags]) test('T5721', normal, compile, ['-v0']) test('TH_PromotedTuple', normal, compile, ['-v0 -ddump-splices']) @@ -231,12 +234,13 @@ test('T1541', normal, compile, ['-v0']) test('T5883', normal, compile, ['-v0 -dsuppress-uniques -ddump-splices']) test('T5882', normal, compile, ['-v0']) test('T5886', extra_clean(['T5886a.hi','T5886a.o']), - multimod_compile, ['T5886','-v0']) + multimod_compile, ['T5886','-v0 ' + config.ghc_th_way_flags]) test('T4135', normal, compile, ['-v0']) test('T5971', normal, compile_fail, ['-v0 -dsuppress-uniques']) test('T5968', normal, compile, ['-v0']) test('T5984', extra_clean(['T5984_Lib.hi', 'T5984_Lib.o']), - multimod_compile, ['T5984', '-v0 -ddump-splices']) + multimod_compile, + ['T5984', '-v0 -ddump-splices ' + config.ghc_th_way_flags]) test('T5555', extra_clean(['T5555_Lib.hi', 'T5555_Lib.o']), multimod_compile, ['T5555', '-v0']) test('T5976', normal, compile_fail, ['-v0']) @@ -249,9 +253,9 @@ test('TH_StringPrimL', normal, compile_and_run, ['']) test('T7064', extra_clean(['T7064a.hi', 'T7064a.o']), multimod_compile_and_run, - ['T7064.hs', '-v0']) + ['T7064.hs', '-v0 ' + config.ghc_th_way_flags]) test('T7092', extra_clean(['T7092a.hi','T7092a.o']), - multimod_compile, ['T7092','-v0']) + multimod_compile, ['T7092', '-v0 ' + config.ghc_th_way_flags]) test('T7276', normal, compile_fail, ['-v0']) test('T7276a', combined_output, ghci_script, ['T7276a.script']) @@ -266,7 +270,7 @@ test('T7445', extra_clean(['T7445a.hi', 'T7445a.o']), test('T7532', extra_clean(['T7532a.hi', 'T7532a.o']), multimod_compile, - ['T7532', '-v0']) + ['T7532', '-v0 ' + config.ghc_th_way_flags]) test('T2222', normal, compile, ['-v0']) test('T1849', normal, ghci_script, ['T1849.script']) test('T7681', normal, compile, ['-v0'])
\ No newline at end of file |