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 | 56a7bf5a7e3526966ffeb96d6b084c7afef6bdef (patch) | |
| tree | 2284ee4ca102bec158af53529564a6b04b19a357 | |
| parent | 7d9b6a9d50d8dee3287ed6217cad09221a225ab2 (diff) | |
| download | bcm5719-llvm-56a7bf5a7e3526966ffeb96d6b084c7afef6bdef.tar.gz bcm5719-llvm-56a7bf5a7e3526966ffeb96d6b084c7afef6bdef.zip | |
remove the old non-parallel test system. 'make' in clang/test now runs
the tests in parallel.
llvm-svn: 49290
| -rw-r--r-- | clang/Makefile | 6 | ||||
| -rw-r--r-- | clang/test/Makefile | 31 | ||||
| -rw-r--r-- | clang/test/Makefile.parallel | 40 |
3 files changed, 29 insertions, 48 deletions
diff --git a/clang/Makefile b/clang/Makefile index 06eeeae716e..6d20df81284 100644 --- a/clang/Makefile +++ b/clang/Makefile @@ -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/clang/test/Makefile b/clang/test/Makefile index 38d0f3c24c6..35f9025934a 100644 --- a/clang/test/Makefile +++ b/clang/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/clang/test/Makefile.parallel b/clang/test/Makefile.parallel deleted file mode 100644 index a88ff0e7a3e..00000000000 --- a/clang/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 |
