From lattner at cs.uiuc.edu Mon Aug 18 00:05:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 00:05:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/Makefile Message-ID: <200308180504.AAA30833@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden: Makefile updated: 1.1 -> 1.2 --- Log message: Use different makefile for directory walking to support reports --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Olden/Makefile diff -u llvm/test/Programs/MultiSource/Olden/Makefile:1.1 llvm/test/Programs/MultiSource/Olden/Makefile:1.2 --- llvm/test/Programs/MultiSource/Olden/Makefile:1.1 Fri Aug 15 13:55:05 2003 +++ llvm/test/Programs/MultiSource/Olden/Makefile Mon Aug 18 00:04:36 2003 @@ -3,4 +3,4 @@ LEVEL = ../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) -include ${LEVEL}/Makefile.common +include $(LEVEL)/test/Programs/Makefile.programs From lattner at cs.uiuc.edu Mon Aug 18 00:07:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 00:07:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/Makefile Message-ID: <200308180506.AAA31551@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist: Makefile updated: 1.1 -> 1.2 --- Log message: Use different makefile for directory walking to support reports --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Ptrdist/Makefile diff -u llvm/test/Programs/MultiSource/Ptrdist/Makefile:1.1 llvm/test/Programs/MultiSource/Ptrdist/Makefile:1.2 --- llvm/test/Programs/MultiSource/Ptrdist/Makefile:1.1 Fri Aug 15 13:55:06 2003 +++ llvm/test/Programs/MultiSource/Ptrdist/Makefile Mon Aug 18 00:06:31 2003 @@ -3,4 +3,4 @@ LEVEL = ../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) -include ${LEVEL}/Makefile.common +include $(LEVEL)/test/Programs/Makefile.programs From lattner at cs.uiuc.edu Mon Aug 18 00:07:05 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 00:07:05 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/Makefile Message-ID: <200308180506.AAA31542@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat: Makefile updated: 1.1 -> 1.2 --- Log message: Use different makefile for directory walking to support reports --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/McCat/Makefile diff -u llvm/test/Programs/MultiSource/McCat/Makefile:1.1 llvm/test/Programs/MultiSource/McCat/Makefile:1.2 --- llvm/test/Programs/MultiSource/McCat/Makefile:1.1 Fri Aug 15 13:55:04 2003 +++ llvm/test/Programs/MultiSource/McCat/Makefile Mon Aug 18 00:06:28 2003 @@ -3,4 +3,4 @@ LEVEL = ../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) -include ${LEVEL}/Makefile.common +include $(LEVEL)/test/Programs/Makefile.programs From lattner at cs.uiuc.edu Mon Aug 18 00:07:07 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 00:07:07 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Makefile Message-ID: <200308180506.AAA31535@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource: Makefile updated: 1.2 -> 1.3 --- Log message: Use different makefile for directory walking to support reports --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Makefile diff -u llvm/test/Programs/MultiSource/Makefile:1.2 llvm/test/Programs/MultiSource/Makefile:1.3 --- llvm/test/Programs/MultiSource/Makefile:1.2 Mon Sep 30 14:22:22 2002 +++ llvm/test/Programs/MultiSource/Makefile Mon Aug 18 00:06:25 2003 @@ -3,4 +3,4 @@ LEVEL = ../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) -include ${LEVEL}/Makefile.common +include $(LEVEL)/test/Programs/Makefile.programs From lattner at cs.uiuc.edu Mon Aug 18 00:10:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 00:10:03 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile Makefile.programs Message-ID: <200308180509.AAA31578@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs: Makefile updated: 1.20 -> 1.21 Makefile.programs updated: 1.86 -> 1.87 --- Log message: Move all of the report machinery OUT of Makefile, into Makefile.programs. This has the following advantages: * Makefile is simple, as it should be * Makefile.programs is the _only_ place that defines the TEST machinery * There are now bugs fixed in it. :) * You can generate reports for subdirectories of programs! --- Diffs of the changes: Index: llvm/test/Programs/Makefile diff -u llvm/test/Programs/Makefile:1.20 llvm/test/Programs/Makefile:1.21 --- llvm/test/Programs/Makefile:1.20 Sun Aug 17 23:46:26 2003 +++ llvm/test/Programs/Makefile Mon Aug 18 00:08:59 2003 @@ -11,44 +11,3 @@ include ${LEVEL}/test/Programs/Makefile.programs -# Include all makefiles which define tests... These makefiles must define -# test..% given input from Output/%.llvm.bc -# -ifdef TEST -TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile) \ - $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile) -TestReport := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).report) \ - $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).report) -ifneq ($(TestMakefile),) --include $(TestMakefile) -endif -endif - -# -# Rules for building a report from 'make report TEST=' -# - -report.$(TEST).raw.out: $(REPORT_DEPENDENCIES) $(TestMakefile) - gmake TEST=$(TEST) 2>&1 | tee $@ - -ifneq ($(TestReport),) -report.$(TEST).txt: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl - ./GenerateReport.pl $(TestReport) < $< > $@ - -report.$(TEST).html: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl - ./GenerateReport.pl -html $(TestReport) < $< > $@ - -report.$(TEST).tex: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl - ./GenerateReport.pl -latex $(TestReport) < $< > $@ - -report: report.$(TEST).txt - @cat $< - -report.html: report.$(TEST).html - -report.tex: report.$(TEST).tex - @cat $< -endif - -clean:: - rm -f report.*.raw.out report.*.txt Index: llvm/test/Programs/Makefile.programs diff -u llvm/test/Programs/Makefile.programs:1.86 llvm/test/Programs/Makefile.programs:1.87 --- llvm/test/Programs/Makefile.programs:1.86 Sun Aug 17 23:39:29 2003 +++ llvm/test/Programs/Makefile.programs Mon Aug 18 00:08:59 2003 @@ -399,11 +399,13 @@ # AVAILABLE_TESTS - Compute the set of tests available for user help # -TEST_FILES = $(filter-out %~, $(wildcard $(PROGDIR)/TEST.*.Makefile)) -AVAILABLE_TESTS = $(TEST_FILES:$(PROGDIR)/TEST.%.Makefile=%) +TEST_FILES = $(wildcard $(PROGDIR)/TEST.*.Makefile) \ + $(wildcard $(LEVEL)/projects/*/test/TEST.*.Makefile) +AVAILABLE_TESTS = $(patsubst TEST.%.Makefile,%,$(notdir $(TEST_FILES))) # If they just say 'make test' then we print out an error telling the user to # specify a TEST= option. +$(PROGRAMS_TO_TEST:%=test..%): \ test..%: @echo @echo "***************************************************************" @@ -421,9 +423,12 @@ ifdef TEST TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile) \ $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile) -ifneq ($(TestMakefile),) +TestReport := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).report) \ + $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).report) +ifneq ($(strip $(TestMakefile)),) -include $(TestMakefile) else +$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: @echo @echo "***************************************************************" @@ -434,3 +439,33 @@ @exit 1 endif endif + +# +# Rules for building a report from 'make report TEST=' +# +GENERATEREPORT := $(LEVEL)/test/Programs/GenerateReport.pl + +report.$(TEST).raw.out: $(REPORT_DEPENDENCIES) $(TestMakefile) + gmake TEST=$(TEST) 2>&1 | tee $@ + +ifneq ($(TestReport),) +report.$(TEST).txt: report.$(TEST).raw.out $(TestReport) $(GENERATEREPORT) + $(GENERATEREPORT) $(TestReport) < $< > $@ + +report.$(TEST).html: report.$(TEST).raw.out $(TestReport) $(GENERATEREPORT) + $(GENERATEREPORT) -html $(TestReport) < $< > $@ + +report.$(TEST).tex: report.$(TEST).raw.out $(TestReport) $(GENERATEREPORT) + $(GENERATEREPORT) -latex $(TestReport) < $< > $@ + +report: report.$(TEST).txt + @cat $< + +report.html: report.$(TEST).html + +report.tex: report.$(TEST).tex + @cat $< +endif + +clean:: + rm -f report.*.raw.out report.*.txt From lattner at cs.uiuc.edu Mon Aug 18 01:06:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Aug 18 01:06:01 2003 Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html NightlyTest.pl Message-ID: <200308180605.BAA00467@apoc.cs.uiuc.edu> Changes in directory llvm/utils: NightlyTestTemplate.html updated: 1.12 -> 1.13 NightlyTest.pl updated: 1.20 -> 1.21 --- Log message: * Split the programs table into MultiSource and SingleSource components * Instead of printing the time to configure as the build time, print the time to configure AND the build time, explicitly --- Diffs of the changes: Index: llvm/utils/NightlyTestTemplate.html diff -u llvm/utils/NightlyTestTemplate.html:1.12 llvm/utils/NightlyTestTemplate.html:1.13 --- llvm/utils/NightlyTestTemplate.html:1.12 Sun Aug 17 23:39:41 2003 +++ llvm/utils/NightlyTestTemplate.html Mon Aug 18 01:05:21 2003 @@ -52,6 +52,8 @@
  • Compilation Log


    The runOnFunction method