on master help sign in
In the test makefile, hide all packages to avoid module name conflicts.

--HG-- extra : convert_revision : c414a439abbf0004ba955ce4c3f5de2674cfafc7

commit8411923df1137c7a852b9b7f6d470b7c1145da99 authorJohn Millikin <jmillikin@gmail.com> dateSun 15 Aug 2010, 19:08 (16 years ago) parent529ee0a
1 file changed+6−4
tests/Makefile+6−4
tests/Makefile+6−4
@@ -1,7 +1,9 @@
11version := $(shell awk '/^version:/{print $$2}' ../text.cabal)
22ghc := ghc
33ghc-opt-flags = -O0
4−ghc-base-flags := -funbox-strict-fields -package criterion -package deepseq \
4+ghc-base-flags := -funbox-strict-fields -hide-all-packages \
5+ -package base -package mtl -package random -package directory \
6+ -package criterion -package deepseq \
57 -package bytestring -ignore-package text \
68 -fno-ignore-asserts
79ghc-test-flags := -package QuickCheck -package test-framework -package deepseq \
@@ -30,7 +32,7 @@ else
3032 cd .. && cabal build
3133endif
3234
33−Properties.o qc qc-hpc: ghc-flags += $(ghc-test-flags)
35+Properties.o Regressions.o qc qc-hpc: ghc-flags += $(ghc-test-flags)
3436Properties.o: QuickCheckUtils.o SlowFunctions.o
3537
3638QuickCheckUtils.o: $(lib)
@@ -44,7 +46,7 @@ sb: SearchBench.o SlowFunctions.o
4446qc-hpc: Properties.hs QuickCheckUtils.hs $(lib-srcs:%=../%)
4547 -mkdir -p hpcdir
4648 @rm -f $@.tix
47− $(ghc) $(ghc-hpc-flags) $(ghc-opt-flags) -ihpcdir \
49+ $(ghc) $(ghc-hpc-flags) $(ghc-test-flags) $(ghc-opt-flags) -ihpcdir \
4850 --make -threaded -o $@ $<
4951
5052regressions: Regressions.o
@@ -59,7 +61,7 @@ qc-hpc-html/hpc_index.html: qc-hpc
5961 --exclude=QuickCheckUtils --srcdir=.. --srcdir=. --destdir=$(dir $@)
6062
6163Benchmarks.o: ghc-opt-flags = -O
62−bm Benchmarks.o: ghc-flags += -hide-package transformers -package utf8-string
64+bm Benchmarks.o: ghc-flags += -package utf8-string
6365bm: Benchmarks.o
6466 $(ghc) $(ghc-flags) -o $@ $^ $(lib)
6567