diff --git a/samples/tests/run_test.sh b/samples/tests/run_test.sh index 8d81472..14d386d 100755 --- a/samples/tests/run_test.sh +++ b/samples/tests/run_test.sh @@ -13,14 +13,14 @@ else sh -c "$bin_dir/$*" > $out_dir/$1.out 2> $out_dir/$1.err fi -dos2unix $out_dir/$1.err $out_dir/$1.out - if [ -f $cmp_dir/$1.out.expected ] && [ "$(md5sum $out_dir/$1.out | cut -d' ' -f1)" != "$(md5sum $cmp_dir/$1.out.expected | cut -d' ' -f1)" ]; then - diff $out_dir/$1.out $cmp_dir/$1.out.expected - exit 255 + if ! diff --strip-trailing-cr $out_dir/$1.out $cmp_dir/$1.out.expected ; then + exit 255 + fi fi if [ -f $cmp_dir/$1.err.expected ] && [ "$(md5sum $out_dir/$1.err | cut -d' ' -f1)" != "$(md5sum $cmp_dir/$1.err.expected | cut -d' ' -f1)" ]; then - diff $out_dir/$1.err $cmp_dir/$1.err.expected - exit 255 + if ! diff --strip-trailing-cr $out_dir/$1.err $cmp_dir/$1.err.expected ; then + exit 255 + fi fi