diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-04-06 22:32:01 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-04-06 22:32:01 +0000 |
| commit | 9d294b9957f57512db8de37452024e82f0fe4f50 (patch) | |
| tree | f998b7091f9816b2b173622c875f37fa7a11a58c | |
| parent | 37c1b78a20a09b0456aa5caa15e159027010ca22 (diff) | |
remove the old non-parallel test system. 'make' in clang/test now runs
the tests in parallel.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49290 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | test/Makefile | 31 | ||||
| -rw-r--r-- | test/Makefile.parallel | 40 |
3 files changed, 29 insertions, 48 deletions
@@ -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 diff --git a/test/Makefile b/test/Makefile index 38d0f3c24c..35f9025934 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 diff --git a/test/Makefile.parallel b/test/Makefile.parallel deleted file mode 100644 index a88ff0e7a3..0000000000 --- a/test/Makefile.parallel +++ /dev/null @@ -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 |