X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2FMakefile;h=0ac92265bc141f95b0459ed6f111da714a7ef6d3;hb=f96194794bf099020706c3816d1a5678b40addbb;hp=1599b37c31ff85f663b190a2a8753bcb3bc350e3;hpb=90631447f6517d757edfeb4a5b4cd7dd6c02ffca;p=ghc-hetmet.git

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 1599b37..0ac9226 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -19,6 +19,12 @@ 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 a/b/c/*
@@ -26,20 +32,23 @@ all:
 # 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_TAR_BZ2)
+	cd a/b/c/ && $(TAR) --force-local -jxf ../../../$(BIN_DIST_TEST_TAR_BZ2)
 ifeq "$(Windows)" "YES"
 	mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
 	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
+	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check
 
 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