remove the old non-parallel test system. 'make' in clang/test now runs

the tests in parallel.

llvm-svn: 49290
This commit is contained in:
Chris Lattner 2008-04-06 22:32:01 +00:00
parent 7d9b6a9d50
commit 56a7bf5a7e
3 changed files with 29 additions and 48 deletions

View File

@ -4,12 +4,12 @@ DIRS := lib Driver
include $(LEVEL)/Makefile.common
test::
@ $(MAKE) -C test -f Makefile.parallel
@ $(MAKE) -C test
report::
@ $(MAKE) -C test -f Makefile.parallel report
@ $(MAKE) -C test report
clean::
@ $(MAKE) -C test -f Makefile.parallel clean
@ $(MAKE) -C test clean
.PHONY: test report clean

View File

@ -1,19 +1,40 @@
LEVEL = ../../..
include $(LEVEL)/Makefile.common
TESTDIRS := CodeGen Lexer Preprocessor Parser Sema Analysis Serialization
TESTDIRS = CodeGen Lexer Preprocessor Parser Sema Analysis Serialization
# Only run rewriter tests on darwin.
ifeq ($(OS),Darwin)
TESTDIRS += Rewriter Analysis-Apple
endif
ifdef VERBOSE
PROGRESS = echo $<
REPORTFAIL = cat $@
DONE = true
else
PROGRESS = printf '.'
REPORTFAIL = (echo; echo '----' $< 'failed ----')
DONE = echo
endif
TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \))))
Output/%.testresults: %
@ $(PROGRESS)
@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) ./TestRunner.sh $< > $@ || $(REPORTFAIL)
all::
PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) \
find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \) \
-print -exec ./TestRunner.sh {} \;
@ mkdir -p $(addprefix Output/, $(TESTDIRS))
@ rm -f $(TESTS)
@ echo '--- Running clang tests ---'
@ $(MAKE) $(TESTS)
@ $(DONE)
report: $(TESTS)
@ cat $^
clean::
@ rm -rf Output/
.PHONY: all clean
.PHONY: all report clean

View File

@ -1,40 +0,0 @@
LEVEL = ../../..
include $(LEVEL)/Makefile.common
TESTDIRS = CodeGen Lexer Preprocessor Parser Sema Analysis Serialization
# Only run rewriter tests on darwin.
ifeq ($(OS),Darwin)
TESTDIRS += Rewriter Analysis-Apple
endif
ifdef VERBOSE
PROGRESS = echo $<
REPORTFAIL = cat $@
DONE = true
else
PROGRESS = printf '.'
REPORTFAIL = (echo; echo '----' $< 'failed ----')
DONE = echo
endif
TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \))))
Output/%.testresults: %
@ $(PROGRESS)
@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) ./TestRunner.sh $< > $@ || $(REPORTFAIL)
all::
@ mkdir -p $(addprefix Output/, $(TESTDIRS))
@ rm -f $(TESTS)
@ echo '--- Running clang tests ---'
@ $(MAKE) -f Makefile.parallel $(TESTS)
@ $(DONE)
report: $(TESTS)
@ cat $^
clean::
@ rm -rf Output/
.PHONY: all report clean