[cfe-commits] r49290 - in /cfe/trunk: Makefile test/Makefile test/Makefile.parallel

[Chris Lattner]

Author: lattner
Date: Sun Apr  6 17:32:01 2008
New Revision: 49290

URL: http://llvm.org/viewvc/llvm-project?rev=49290&view=rev
Log:
remove the old non-parallel test system.  'make' in clang/test now runs
the tests in parallel.

Removed:
    cfe/trunk/test/Makefile.parallel
Modified:
    cfe/trunk/Makefile
    cfe/trunk/test/Makefile

Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=49290&r1=49289&r2=49290&view=diff

==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Sun Apr  6 17:32:01 2008
@@ -4,12 +4,12 @@
 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

Modified: cfe/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Makefile?rev=49290&r1=49289&r2=49290&view=diff

==============================================================================
--- cfe/trunk/test/Makefile (original)
+++ cfe/trunk/test/Makefile Sun Apr  6 17:32:01 2008
@@ -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

Removed: cfe/trunk/test/Makefile.parallel
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Makefile.parallel?rev=49289&view=auto

==============================================================================
--- cfe/trunk/test/Makefile.parallel (original)
+++ cfe/trunk/test/Makefile.parallel (removed)
@@ -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