From 656d6b9b4b2f6f4f98b848b9eaecd8cd64adf016 Mon Sep 17 00:00:00 2001 From: kanschat Date: Sun, 2 Sep 2007 20:57:21 +0000 Subject: [PATCH] add an option for side-by-side diffs and do not remove OK-file git-svn-id: https://svn.dealii.org/trunk@15104 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/scripts/diffsearch | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/deal.II/common/scripts/diffsearch b/deal.II/common/scripts/diffsearch index 991f6b99dc..12b611afb3 100755 --- a/deal.II/common/scripts/diffsearch +++ b/deal.II/common/scripts/diffsearch @@ -18,15 +18,16 @@ # # options may be # -v for verbose output of diff +# -y for side-by-side diff diffout="/dev/null" diffopt="" result="" +okname="" for arg in $* ; do - if test "x$arg" = "x-v" ; then - diffout="/dev/stdout" ; - fi + if test "x$arg" = "x-v" ; then diffout="/dev/stdout" ; fi + if test "x$arg" = "x-y" ; then diffopt="-y" ; fi done # First, we check if $1/OK exists. If so, it hopefully contains the @@ -40,16 +41,22 @@ if test -r $1/OK; then touch $1/OK echo "$result" exit 0 ; + else + echo " $1/cmp/$okname "; fi fi fi -rm -f $1/OK +# rm -f $1/OK # If this round failed, check all files in this directory # If successful, write the name into $1/OK for file in `cd $1/cmp ; ls` ; do + if test "$diffout" != "/dev/null" ; then + echo + echo "################### $1/cmp/$file" > $diffout + fi if test -f $1/cmp/$file ; then result="$result $file" if diff $diffopt $1/output $1/cmp/$file > $diffout ; then -- 2.39.5