Follow changes in GHC's build system

testsuite/mk/test.mk

@@ -30,9 +30,6 @@ endif
 export MAKE
 
 # ghastly hack, because the driver requires that $tool be an absolute path name.
-GHC_STAGE1_ABS	= $(GHC_COMPILER_DIR_ABS)/stage1/ghc-inplace
-GHC_STAGE2_ABS	= $(GHC_COMPILER_DIR_ABS)/stage2/ghc-inplace
-GHC_STAGE3_ABS	= $(GHC_COMPILER_DIR_ABS)/stage3/ghc-inplace
 GHC_PKG_ABS     = $(GHC_PKG_DIR_ABS)/ghc-pkg-inplace
 HP2PS_ABS	= $(GHC_HP2PS_DIR_ABS)/hp2ps
 GS = gs
@@ -44,9 +41,9 @@ CONFIG       = $(CONFIGDIR)/$(COMPILER)
 
 # can be overriden from the command line
 ifneq "$(stage)" ""
-TEST_HC = $(GHC_STAGE$(stage)_ABS)
+TEST_HC = $(GHC_STAGE$(stage))
 else
-TEST_HC = $(GHC_STAGE2_ABS)
+TEST_HC = $(GHC_STAGE2)
 endif
 
 GHC_PKG = $(GHC_PKG_ABS)