]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
diffsearch reverted
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 22 Jun 2006 07:51:12 +0000 (07:51 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 22 Jun 2006 07:51:12 +0000 (07:51 +0000)
git-svn-id: https://svn.dealii.org/trunk@13292 0785d39b-7218-0410-832d-ea1e28bc413d

tests/Makefile.rules

index 9ed18e4aa1e4f23fc3e81435c47344b6eca46262..6f80292610fa411d3bf0d32ffcce53eb292b0f53 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.