Pass --no-user-package-conf to ghc-pkg in bindisttest

[ghc-hetmet.git] / bindisttest / Makefile

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index e0ec21a..7332bab 100644 (file)
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -19,25 +19,37 @@ default_target: all
 TOP=..
 include $(TOP)/mk/config.mk
 
+ifeq "$(TEST_PREP)" "YES"
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_PREP_TAR_BZ2)
+else
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2)
+endif
+
 all:
        $(RM) -rf $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
+       $(RM) -rf a/b/c/*
        $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-       # --force-local makes tar not think that c:/foo refers to a remote file
-       $(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2)
+# We use the a/b/c subdirectory as configure looks for install-sh in
+# . .. ../.. and we don't want it to find the build system's install-sh.
+# --force-local makes tar not think that c:/foo refers to a remote file
+       cd a/b/c/ && $(TAR) --force-local -jxf ../../../$(BIN_DIST_TEST_TAR_BZ2)
 ifeq "$(Windows)" "YES"
-       mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
+       mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-       cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
-       cd $(BIN_DIST_NAME) && make install
+       cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
+       cd a/b/c/$(BIN_DIST_NAME) && make install
 endif
+       $(BIN_DIST_INST_DIR)/bin/runghc HelloWorld > output
+       $(CONTEXT_DIFF) output expected_output
        $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
        ./HelloWorld > output
        $(CONTEXT_DIFF) output expected_output
+# Without --no-user-package-conf we might pick up random packages from ~/.ghc
+       $(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
 
 clean distclean:
        $(RM) -rf $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
+       $(RM) -rf a/b/c/*
        $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets