[cfe-commits] r55103 - /cfe/trunk/test/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Wed Aug 20 21:48:23 2008
New Revision: 55103

URL: http://llvm.org/viewvc/llvm-project?rev=55103&view=rev
Log:
Update test/Makefile to allow testing when using a separate obj
directory.
 - Also, return proper error code if testing fails.

Modified:
    cfe/trunk/test/Makefile

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

==============================================================================
--- cfe/trunk/test/Makefile (original)
+++ cfe/trunk/test/Makefile Wed Aug 20 21:48:23 2008
@@ -1,8 +1,8 @@
 LEVEL = ../../..
 include $(LEVEL)/Makefile.common
 
-# Test in all non .svn or Output directories below this one.
-TESTDIRS = $(shell find . -name . -o -name .svn -prune -o -name Output -prune -o -type d -print)
+# Test in all immediate subdirectories.
+TESTDIRS = $(shell echo $(PROJ_SRC_DIR)/*/)
 
 # Only run rewriter tests on darwin.
 ifeq ($(OS),Darwin)
@@ -23,7 +23,7 @@
 
 Output/%.testresults: %
 	@ $(PROGRESS)
-	@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) ./TestRunner.sh $< > $@ || $(REPORTFAIL)
+	@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts VG=$(VG) $(PROJ_SRC_DIR)/TestRunner.sh $< > $@ || $(REPORTFAIL)
 
 all::
 	@ mkdir -p $(addprefix Output/, $(TESTDIRS))
@@ -31,6 +31,7 @@
 	@ echo '--- Running clang tests ---'
 	@ $(MAKE) $(TESTS)
 	@ $(DONE)
+	@ cat $(TESTS) | count 0
 
 report: $(TESTS)
 	@ cat $^