From: kanschat Date: Fri, 15 Sep 2006 19:07:34 +0000 (+0000) Subject: Introduce the new status file always containing the last attempted processing step\ X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=230f48ba54698cd75a3da2f9d25d994386f43513;p=dealii-svn.git Introduce the new status file always containing the last attempted processing step\ Use this file to speed up "make report" git-svn-id: https://svn.dealii.org/trunk@13911 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/.cvsignore b/tests/.cvsignore deleted file mode 100644 index 592332ceae..0000000000 --- a/tests/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -config.log config.status Makefile.paths -compare -ii_files diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 8d9f22cbd3..0d7a80996d 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -31,10 +31,12 @@ endif %/obj.g.$(OBJEXT) : %.cc @echo =====debug========= $< + @echo Compiling > $*/status @$(CXX) $(flags) -c $< -o $@ %/obj.$(OBJEXT) : %.cc @echo =====optimized===== $< + @echo Compiling > $*/status @$(CXX) $(CXXFLAGS.o) -c $< -o $@ ###################################################################### @@ -42,6 +44,7 @@ endif ###################################################################### %/exe : %/obj.g.$(OBJEXT) @echo =====linking======= $@ + @echo Linking > $*/status @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) @@ -65,6 +68,7 @@ endif %/output : %/exe @echo =====Running======= $< + @echo Running > $*/status @ulimit -t 2400 ; ./$< ; \ if test ! $$? = 0 ; then rm $@ ; false ; fi @perl -pi $(normalize) $@ @@ -94,6 +98,7 @@ endif %/OK : %/output @echo '=====Checking======' $< + @echo Checking > $*/status @$(PERL) -pi $(normalize) $< @for i in $(PLATFORM-HIERARCHY) ; do \ testname=$(<:%/output=%) ; \ @@ -106,7 +111,8 @@ endif fi ; \ if eval $$cmd ; then \ echo '=====OK============' $@ ; \ - touch $@ ; \ + echo 'diff ok' > $*/status ; \ + echo $$i > $@ ; \ else \ if test "x$(verbose)" = "xon" ; then \ echo '+++++Error+++++++++' $@ " ($$testname/cmp/$$i)" ; \ @@ -136,11 +142,7 @@ endif report: @-$(MAKE) -k run-tests @for test in $(sort $(tests)) ; do \ - if $(MAKE) -q $$test/OK ; then \ - echo `date -u +"%Y-%m-%d %H:%M"` " + $(WORKDIR)/$$test" ; \ - else \ - echo `date -u +"%Y-%m-%d %H:%M"` " 0 $(WORKDIR)/$$test" ; \ - fi ; \ + echo `date -u +"%Y-%m-%d %H:%M"` "`perl $D/common/scripts/status_to_report.pl $$test/status`" "$(WORKDIR)/$$test" ; \ done diff --git a/tests/test/Makefile b/tests/test/Makefile index a0d3e9b740..033ee6752e 100644 --- a/tests/test/Makefile +++ b/tests/test/Makefile @@ -35,10 +35,20 @@ tests = $(call expand,$(tests_x)) phony.h: touch phony.h -### Make sure even numbers are are always recompiled +############################################################ +# Make sure even numbers are are always recompiled +############################################################ no_*_?[02468]/obj.g.o: phony.h +############################################################ +# Another odd target that sets al OK files to the OK status +# Try 'make report' after doing this +############################################################ + +all-ok: + @for test in $(tests); do echo 'diff ok' > $$test/OK ; done + include ../Makefile.rules include Makefile.depend diff --git a/tests/test/README b/tests/test/README index 61da174e97..1c6f9f2efa 100644 --- a/tests/test/README +++ b/tests/test/README @@ -1,4 +1,5 @@ -This directory tests the testsuite, not the deal.II library! +This directory tests the testsuite, not the deal.II library! It should +not be included in the regular regression test runs! Things that should be checked for when changing the implementation of the test suite: @@ -13,3 +14,8 @@ Remarks on the implementation The file phony.h is used to make sure compilation is started in EVERY run of make for targets with even numbers. + +The current use of phony.h makes 'make report' report a wrong result +for ok_02. While this is not a problem as long as we know it, we must +be aware of it when changing the implementation. +