X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=bindisttest%2Fghc.mk;h=e051be0ccd303b183b56729f1abf9db62116a3d5;hp=be9143b651dfc5db6498de4f30e58fb962559ff6;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=7eb456b97c5a9911981afa172acf9ef50b75f9fa

diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index be9143b..e051be0 100644
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
@@ -19,7 +19,7 @@ endif
 .PHONY: test_bindist
 test_bindist:
 	"$(RM)" $(RM_OPTS_REC) bindisttest/$(BIN_DIST_INST_SUBDIR)
-	"$(RM)" $(RM_OPTS_REC) bindisttest/a/b/c/*
+	"$(RM)" $(RM_OPTS_REC) bindisttest/a
 	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld
 	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.o
 	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.hi
@@ -30,15 +30,21 @@ test_bindist:
 # NB. tar has funny interpretation of filenames sometimes (thinking
 # c:/foo is a remote file), so it's safer to bzip and then pipe into
 # tar rather than using tar -xjf:
-	cd bindisttest/a/b/c/ && bzip2 -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR) -xf -
+	mkdir bindisttest/a
+	mkdir bindisttest/a/b
+	mkdir bindisttest/a/b/c
+	cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
+	$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
 ifeq "$(Windows)" "YES"
 	mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR)
+	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) --with-gcc="$(WhatGccIsCalled)"
 	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && $(MAKE) install
 endif
+ifeq "$(GhcProfiled)" "NO"
 	$(BIN_DIST_INST_DIR)/bin/runghc bindisttest/HelloWorld > bindisttest/output
 	$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output
+endif
 	$(BIN_DIST_INST_DIR)/bin/ghc --make bindisttest/HelloWorld
 	bindisttest/HelloWorld > bindisttest/output
 	$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output