From: guido Date: Thu, 22 Jun 2006 07:51:12 +0000 (+0000) Subject: diffsearch reverted X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc65f374dcf05f70f686dd02f6dc4e66340caf40;p=dealii-svn.git diffsearch reverted git-svn-id: https://svn.dealii.org/trunk@13292 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 9ed18e4aa1..6f80292610 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -93,25 +93,38 @@ endif %/OK : %/output - @echo -n '=====Checking======' $< + @echo '=====Checking======' $< @$(PERL) -pi $(normalize) $< - @if test "x$(verbose)" = "xon" ; then \ - cmd="$D/common/scripts/diffsearch $(<:%/output=%) -v" ; \ - else \ - cmd="$D/common/scripts/diffsearch $(<:%/output=%)" ; \ - fi ; \ - if eval $$cmd ; then \ - echo '=====OK============' $@ ; \ - else \ - if test "x$(verbose)" = "xon" ; then \ - echo '+++++Error+++++++++' $@ ; \ - else \ - echo '+++++Error+++++++++' $@ " Use make verbose=on for the diffs" ; \ - fi ; \ - if test "x$(stop_on_error)" = "xon" ; then \ - exit 1 ; \ - fi ; \ - fi + @for i in $(PLATFORM-HIERARCHY) ; do \ + testname=$(<:%/output=%) ; \ + if test -f $$testname/cmp/$$i ; then \ + cmpfile_found=yes ; \ + if test "x$(verbose)" = "xon" ; then \ + cmd="diff $(DIFFOPT) -w $< $$testname/cmp/$$i" ; \ + else \ + cmd="diff -w $< $$testname/cmp/$$i > /dev/null" ; \ + fi ; \ + if eval $$cmd ; then \ + echo '=====OK============' $@ ; \ + touch $@ ; \ + else \ + if test "x$(verbose)" = "xon" ; then \ + echo '+++++Error+++++++++' $@ " ($$testname/cmp/$$i)" ; \ + else \ + echo '+++++Error+++++++++' $@ "($$testname/cmp/$$i) Use make verbose=on for the diffs" ; \ + fi ; \ + if test "x$(stop_on_error)" = "xon" ; then \ + exit 1 ; \ + fi ; \ + fi ; \ + break ; \ + fi ; \ + done && \ + if test "x$$cmpfile_found" != "xyes" ; then \ + echo "*** No suitable file in $$testname/cmp found! ***" ; \ + false ; \ + fi + ############################################################ # Generate a report for the present date, in which the