X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2Fghc.mk;h=a3e97b08f150ee58bf31b97b22534d81947ff6dc;hb=9176377bf7d989919fe7d27cad1f56bd9c4e7b6b;hp=be9143b651dfc5db6498de4f30e58fb962559ff6;hpb=7eb456b97c5a9911981afa172acf9ef50b75f9fa;p=ghc-hetmet.git diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk index be9143b..a3e97b0 100644 --- a/bindisttest/ghc.mk +++ b/bindisttest/ghc.mk @@ -30,15 +30,18 @@ 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 - + 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