From 3d8d8036747ee25400d3eb9ce789fd3b1e913d6c Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 7 Oct 2021 00:38:06 -0600 Subject: [PATCH] testmaps: ignore space change in json diff --- testmaps/automatated_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index 2d692ea8..386c69b4 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -70,10 +70,10 @@ for bsp in ${COMMIT_JSON_MAPS}; do cp ${bsp}.qbsplog reference_bsp_json/${bsp}.qbsplog else echo "Diff of reference_bsp_json/${bsp}.qbsplog and ${bsp}.qbsplog:" - diff -U3 --strip-trailing-cr reference_bsp_json/${bsp}.qbsplog ${bsp}.qbsplog + diff -U3 -w reference_bsp_json/${bsp}.qbsplog ${bsp}.qbsplog echo "Diff of reference_bsp_json/${bsp}.json and ${bsp}.json:" - diff -U3 --strip-trailing-cr reference_bsp_json/${bsp}.json ${bsp}.json || exit 1 + diff -U3 -w reference_bsp_json/${bsp}.json ${bsp}.json || exit 1 fi done