From 1ce3702e324e4f6b89acad2ef89941ae4ce51aa0 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Wed, 6 Oct 2021 18:31:09 -0600 Subject: [PATCH] testmaps: ignore trailing space in .json diff (line ending differences) --- testmaps/automatated_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index 3250d7bd..ddca3a0a 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -68,7 +68,7 @@ for bsp in ${COMMIT_JSON_MAPS}; do cp ${bsp}.json reference_bsp_json/${bsp}.json else echo "Diff of reference_bsp_json/${bsp}.json and ${bsp}.json:" - diff -U3 reference_bsp_json/${bsp}.json ${bsp}.json || exit 1 + diff -U3 --ignore-trailing-space reference_bsp_json/${bsp}.json ${bsp}.json || exit 1 fi done