Skip to content

Commit

Permalink
use precise dependencies at the configure step in all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@lyokha
lyokha committed Apr 3, 2024
1 parent 99c0e99 commit ca9304c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 7 deletions.
6 changes: 5 additions & 1 deletion test/Aggregate/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) -ddump-splices $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/EDE/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/PCRE/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/Prometheus/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/Resolve/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/ServiceHookAdaptor/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down
6 changes: 5 additions & 1 deletion test/Subrequest/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ ifeq ($(INPLACE),1)
$(GHCENV)
endif
sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
--package-db=clear --package-db=global \
$$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
$$(sed -n 's/^package-id\s\+\(.*\)'` \
`'\(-\([0-9]\+\.\)*[0-9]\+\($$\|-.*\)\)/'` \
`'--dependency=\1=\1\2/p' \
$(GHCENV)) \
--prefix=$(PREFIX)
nhm-tool deps $(PKGNAME) >> $(GHCENV)
runhaskell --ghc-arg=-package=base \
--ghc-arg=-package=$(PKGDISTR) Setup.hs build \
--ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
Expand Down

0 comments on commit ca9304c

Please sign in to comment.