[llvm-commits] [test-suite] r91034 - /test-suite/trunk/Makefile.programs

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec  9 19:39:42 2009
New Revision: 91034

URL: http://llvm.org/viewvc/llvm-project?rev=91034&view=rev
Log:
NightlyTest: Instead of logging all data to the report.foo.raw.out file, only concatenate the individual test reports in an atomic step.
 - This unbreaks ENABLE_PARALLEL_REPORT with 'make report', without this the output would be garbled which breaks GenerateReport.pl.

Modified:
    test-suite/trunk/Makefile.programs

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=91034&r1=91033&r2=91034&view=diff

==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Wed Dec  9 19:39:42 2009
@@ -798,7 +798,8 @@
 endif
 
 report.$(TEST).raw.out: $(REPORT_DEPENDENCIES) $(TestMakefile)
-	$(MAKE) $(FORCE_SERIAL_ARG) TEST=$(TEST) 2>&1 | tee $@
+	$(MAKE) $(FORCE_SERIAL_ARG) TEST=$(TEST)
+	cat Output/*.$(TEST).report.txt | tee $@
 
 ifneq ($(TestReport),)
 report.$(TEST).txt: report.$(TEST).raw.out $(TestReport) $(GENERATEREPORT)