X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Ftests%2Fmk%2Fboilerplate.mk;h=794c5a6e3ecde62fb2b574c16da6f493a36ee8ef;hb=22dcfa7c2e3629c2b312cea1e71a6a3e00ed894b;hp=8629c89a215fa73fb5950b636795f178c9d975f3;hpb=e8a827d9892848618d5036a1de884ba0f8fe1616;p=ghc-hetmet.git

diff --git a/ghc/tests/mk/boilerplate.mk b/ghc/tests/mk/boilerplate.mk
index 8629c89..794c5a6 100644
--- a/ghc/tests/mk/boilerplate.mk
+++ b/ghc/tests/mk/boilerplate.mk
@@ -14,22 +14,19 @@
 
 TEST_TOP := $(TOP)
 TOP := $(TOP)/..
+
 include $(TOP)/mk/boilerplate.mk
 TOP:=$(TEST_TOP)
 
+# By default, we're testing the GHC in the build tree.
+HC=$(GHC_INPLACE)
 
 # -----------------------------------------------------------------
 # Everything after this point
 # augments or overrides previously set variables.
-# (these files are optional, so `make' won't fret if it
-#  cannot get to them).
 # -----------------------------------------------------------------
 
-
-# Define TEST_PROG.  In ..../nofib/imaginary/exp3_8, PROG is exp3_8 by default.
-#
-TEST_PROG = $(notdir $(shell pwd))$(_way)
-
-# Eventually, have the binary purged
-CLEAN_FILES += $(TEST_PROG)
-
+-include $(TOP)/mk/paths.mk
+-include $(TOP)/mk/opts.mk
+-include $(TOP)/mk/version.mk
+-include $(TOP)/mk/suffix.mk