diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-14 16:56:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-15 00:49:24 +0000 |
| commit | 6215d4c858c1502c6c1929521fdd7fd00f16bb2d (patch) | |
| tree | 4137b2064914fe23306a68219127dd8347075b86 /testsuite/tests/plugins | |
| parent | f3da8ce8a034f1c0e3dc9aa30faf721fea2ec70b (diff) | |
| download | haskell-6215d4c858c1502c6c1929521fdd7fd00f16bb2d.tar.gz | |
Fix tests for dynamic ghc
Diffstat (limited to 'testsuite/tests/plugins')
| -rw-r--r-- | testsuite/tests/plugins/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/plugins/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/plugins/simple-plugin/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
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 |