Commit 8b733dea authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Decouple ghcpkg02 from the GHC build tree

parent 67a9cc8c
......@@ -155,18 +155,14 @@ shadow:
# every package we know about. This is for testing the pretty printing/parsing
# of InstalledPackageInfo.
COPY_PACKAGE_CONF = package.conf.copy
GHC_PKG_COPY = '$(GHC_PKG)' --no-user-package-conf --global-conf=$(COPY_PACKAGE_CONF)
# Hack: the testsuite is separate from the build tree now, we don't
# have a good way to do this.
INPLACE_DATA_DIR = $(TOP)/../inplace/lib
PACKAGE_CONF_ghcpkg02 = package.conf.ghcpkg02
GHC_PKG_ghcpkg02 = '$(GHC_PKG)' --no-user-package-conf --global-conf=$(PACKAGE_CONF_ghcpkg02)
ghcpkg02:
rm -rf $(COPY_PACKAGE_CONF)
cp -r $(INPLACE_DATA_DIR)/package.conf.d $(COPY_PACKAGE_CONF)
rm -rf $(PACKAGE_CONF_ghcpkg02)
$(GHC_PKG_ghcpkg02) init $(PACKAGE_CONF_ghcpkg02)
set -e; \
for i in `$(GHC_PKG_COPY) list --global --simple-output -v0`; do \
for i in `$(GHC_PKG) list --global --simple-output -v0`; do \
echo Updating $$i; \
$(GHC_PKG_COPY) describe --global $$i | $(GHC_PKG_COPY) update --global --force -; \
$(GHC_PKG) describe --global $$i | $(GHC_PKG_ghcpkg02) update --global --force -; \
done
......@@ -7,7 +7,7 @@ test('ghcpkg01',
['$MAKE -s --no-print-directory ghcpkg01'])
test('ghcpkg02',
[ignore_output,
extra_clean(['package.conf.copy', 'package.conf.copy.old'])],
extra_clean(['package.conf.ghcpkg02', 'package.conf.ghcpkg02.old'])],
run_command,
['$MAKE -s --no-print-directory ghcpkg02'])
test('ghcpkg03',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment