From 4760c4bae73a9eb828481dfde249fcdc160fbf6c Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 27 Jun 2012 23:48:39 +0000 Subject: [PATCH] Rip out legacy DejaGNU support from our Makefiles. This hasn't been the default in forever, and hasn't even worked since most of the .exp files were removed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159307 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Makefile | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/test/Makefile b/test/Makefile index e82bcd59631..b16d6099c75 100644 --- a/test/Makefile +++ b/test/Makefile @@ -27,7 +27,6 @@ $(warning GREP_OPTIONS environment variable may interfere with test results) endif ifdef VERBOSE -RUNTESTFLAGS := $(VERBOSE) LIT_ARGS := -v else LIT_ARGS := -s -v @@ -42,7 +41,6 @@ ifdef TESTSUITE LIT_TESTSUITE := $(TESTSUITE) CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE)) CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE)) -RUNTESTFLAGS += --tool $(CLEANED_TESTSUITE) else LIT_TESTSUITE := . endif @@ -70,16 +68,6 @@ endif endif endif -IGNORE_TESTS := - -ifndef RUNLLVM2CPP -IGNORE_TESTS += llvm2cpp.exp -endif - -ifdef IGNORE_TESTS -RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))" -endif - # ulimits like these are redundantly enforced by the buildbots, so # just removing them here won't work. # Both AuroraUX & Solaris do not have the -m flag for ulimit @@ -94,16 +82,6 @@ ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 1024000 ; endif # AuroraUX endif # SunOS -ifneq ($(RUNTEST),) -check-local-dg:: site.exp - ( $(ULIMIT) \ - PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(LLVMGCCDIR)/bin:$(PATH)" \ - $(RUNTEST) $(RUNTESTFLAGS) ) -else -check-local-dg:: site.exp - @echo "*** dejagnu not found. Make sure 'runtest' is in your PATH, then reconfigure LLVM." -endif - check-local-lit:: lit.site.cfg Unit/lit.site.cfg ( $(ULIMIT) \ $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) -- 2.34.1