From 9996dab4f5d8743617ee64db4b99421321b5cbb6 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Mon, 26 Jun 2017 13:23:59 +0200 Subject: [PATCH] test/osd/osd-scrub-repair.sh: Fix diff options Signed-off-by: Willem Jan Withagen --- src/test/osd/osd-scrub-repair.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh index 968acc72cbb..8ab73cfd6fc 100755 --- a/src/test/osd/osd-scrub-repair.sh +++ b/src/test/osd/osd-scrub-repair.sh @@ -1907,7 +1907,7 @@ function corrupt_scrub_erasure() { EOF jq "$jqfilter" $dir/json | python -c "$sortkeys" | sed -e "$sedfilter" > $dir/csjson - diff -y $termwidth $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1 + diff ${DIFFCOLOPTS} $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1 if test $getjson = "yes" then jq '.' $dir/json > save3.json @@ -2491,7 +2491,7 @@ EOF fi jq "$jqfilter" $dir/json | python -c "$sortkeys" | sed -e "$sedfilter" > $dir/csjson - diff -y $termwidth $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1 + diff ${DIFFCOLOPTS} $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1 if test $getjson = "yes" then if [ "$allow_overwrites" = "true" ] -- 2.39.5