testsuite: Ignore line endings when diff'ing results

This commit is contained in:
Luca Bacci
2024-11-04 10:43:08 +01:00
parent 1855737aee
commit b017dd54d1
4 changed files with 6 additions and 6 deletions

View File

@@ -25,7 +25,7 @@ for t in ${TESTS[*]}; do
cd $OLDPWD
if diff -u "$expected" "$result" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result" > "$diff"; then
echo "ok $I $name"
rm "$diff"
else

View File

@@ -22,7 +22,7 @@ for t in ${TESTS[*]}; do
$GTK_BUILDER_TOOL simplify $t 2>/dev/null >$result
if diff -u "$expected" "$result" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result" > "$diff"; then
echo "ok $I $name"
rm "$diff"
else
@@ -35,7 +35,7 @@ for t in ${TESTS[*]}; do
cp $t $result2
$GTK_BUILDER_TOOL simplify --replace $result2 2>/dev/null
if diff -u "$expected" "$result2" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result2" > "$diff"; then
echo "ok $I $name (--replace)"
rm "$diff"
else

View File

@@ -22,7 +22,7 @@ for t in ${TESTS[*]}; do
$GTK_BUILDER_TOOL simplify --3to4 $t 2>/dev/null >$result
if diff -u "$expected" "$result" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result" > "$diff"; then
echo "ok $I $name"
rm "$diff"
else
@@ -35,7 +35,7 @@ for t in ${TESTS[*]}; do
cp $t $result2
$GTK_BUILDER_TOOL simplify --3to4 --replace $result2 2>/dev/null
if diff -u "$expected" "$result2" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result2" > "$diff"; then
echo "ok $I $name (--replace)"
rm "$diff"
else

View File

@@ -28,7 +28,7 @@ for t in ${TESTS[*]}; do
cd $OLDPWD
if diff -u "$expected" "$result" > "$diff"; then
if diff --strip-trailing-cr -u "$expected" "$result" > "$diff"; then
echo "ok $I $name"
rm "$diff"
else