The best unbreakage yet, addressing Bill's concerns.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 77e6e4ba71b81fa7732eff14c79526650d416158..593caafc8acf3281c09d02e74fb24617c42e1b3b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,6 +24,7 @@ include Makefile.tests
 
 ifdef TESTSUITE
 CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
 RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
@@ -31,9 +32,14 @@ ifndef RUNLLVM2CPP
 RUNTESTFLAGS += --ignore llvm2cpp.exp
 endif
 
+ifneq ($(RUNTEST),)
 check-local:: site.exp
        PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
        $(RUNTEST) $(RUNTESTFLAGS)
+else
+check-local:: site.exp
+       @echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."
+endif
 
 clean::
        $(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
@@ -47,8 +53,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
        @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
        @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
-       @echo 'set tooldir "$(ToolDir)"' >>site.tmp
-       @echo 'set libdir "$(LibDir)"' >>site.tmp
+       @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
+       @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
        @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
        @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
        @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp