diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-02-20 08:25:50 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2016-02-20 08:53:20 +0000 |
| commit | 80d35be1263b57d9f48bf01372388310ecc3266f (patch) | |
| tree | 27975c1ed40c431b9cd91d51a4f977dbdc3a633f /testsuite/tests/plugins | |
| parent | 234048577efc713a0630c58ebe813dafeaf5deeb (diff) | |
| download | haskell-80d35be1263b57d9f48bf01372388310ecc3266f.tar.gz | |
Use a better test for profiling
The previous test failed for me because I had
GhcRTSWays += thr_debug_p
in my validate.mk, which doesn't enable profiling by itself.
Diffstat (limited to 'testsuite/tests/plugins')
| -rw-r--r-- | testsuite/tests/plugins/annotation-plugin/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/plugins/rule-defining-plugin/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/plugins/simple-plugin/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/plugins/annotation-plugin/Makefile b/testsuite/tests/plugins/annotation-plugin/Makefile index ad54f75b6f..b6aa22005e 100644 --- a/testsuite/tests/plugins/annotation-plugin/Makefile +++ b/testsuite/tests/plugins/annotation-plugin/Makefile @@ -13,6 +13,6 @@ package.%: mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs "$(GHC_PKG)" init pkg.$*/local.package.conf - pkg.$*/setup configure --distdir pkg.$*/dist -v0 $(CABAL_PLUGIN_BUILD) --prefix="$(HERE)/pkg.$*/install" --with-compiler="$(TEST_HC)" $(if $(findstring _p,$(GhcRTSWays)), --enable-library-profiling) --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)" $(if $(findstring YES,$(HAVE_PROFILING)), --enable-library-profiling) --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/plugins/rule-defining-plugin/Makefile b/testsuite/tests/plugins/rule-defining-plugin/Makefile index a78ba1ddc8..19422800c8 100644 --- a/testsuite/tests/plugins/rule-defining-plugin/Makefile +++ b/testsuite/tests/plugins/rule-defining-plugin/Makefile @@ -13,6 +13,6 @@ package.%: mkdir pkg.$* "$(TEST_HC)" -outputdir pkg.$* --make -v0 -o pkg.$*/setup Setup.hs "$(GHC_PKG)" init 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 $(if $(findstring _p,$(GhcRTSWays)), --enable-library-profiling) + 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 $(if $(findstring YES,$(HAVE_PROFILING)), --enable-library-profiling) pkg.$*/setup build --distdir pkg.$*/dist -v0 pkg.$*/setup install --distdir pkg.$*/dist -v0 diff --git a/testsuite/tests/plugins/simple-plugin/Makefile b/testsuite/tests/plugins/simple-plugin/Makefile index ed51533379..6d9829f15c 100644 --- a/testsuite/tests/plugins/simple-plugin/Makefile +++ b/testsuite/tests/plugins/simple-plugin/Makefile @@ -15,6 +15,6 @@ package.%: "$(GHC_PKG)" init 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 $(if $(findstring _p,$(GhcRTSWays)), --enable-library-profiling) + 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 $(if $(findstring YES,$(HAVE_PROFILING)), --enable-library-profiling) pkg.$*/setup build --distdir pkg.$*/dist -v0 pkg.$*/setup install --distdir pkg.$*/dist -v0 |