[cfe-commits] r48458 - /cfe/trunk/test/Makefile.parallel

[Gabor Greif]

Author: ggreif
Date: Mon Mar 17 11:29:58 2008
New Revision: 48458

URL: http://llvm.org/viewvc/llvm-project?rev=48458&view=rev
Log:
Implemented verbose mode.
  make test VERBOSE=1
should now produce the same output like
the Makefile normally does.
Without VERBOSE only the names of failed tests
are printed.

I am pretty comfortable with this version, and
I think it is time to switch over to Makefile.parallel
to be the default.

What do you think? Did I forget some piece of feedback?

Modified:
    cfe/trunk/test/Makefile.parallel

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

==============================================================================
--- cfe/trunk/test/Makefile.parallel (original)
+++ cfe/trunk/test/Makefile.parallel Mon Mar 17 11:29:58 2008
@@ -8,18 +8,24 @@
 TESTDIRS += Rewriter
 endif
 
+ifdef VERBOSE
+PROGRESS = echo $<
+REPORTFAIL = cat $@
+else
+PROGRESS = printf '.'
+REPORTFAIL = (echo; echo '----' $< 'failed ----')
+endif
+
 TESTS = $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \))))
 
 Output/%.testresults: %
-	@ printf '.'
-	@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh $< > $@ || (echo; echo '----' $< 'failed ----')
+	@ $(PROGRESS)
+	@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh $< > $@ || $(REPORTFAIL)
 
 all::
 	@ rm -f $(TESTS)
 	@ echo '--- Running clang tests ---'
 	@ $(MAKE) -f Makefile.parallel $(TESTS)
-	@ echo
-	@ $(MAKE) -f Makefile.parallel report
 
 report: $(TESTS)
 	@ cat $^