Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testsuite: Ignore line endings when diff'ing results

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/tools/enumerate
View File

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

4
testsuite/tools/simplify
View File

@@ -22,7 +22,7 @@ for t in ${TESTS[*]}; do
$GTK_BUILDER_TOOL simplify $t 2>/dev/null >$result $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" echo "ok $I $name"
rm "$diff" rm "$diff"
else else
@@ -35,7 +35,7 @@ for t in ${TESTS[*]}; do
cp $t $result2 cp $t $result2
$GTK_BUILDER_TOOL simplify --replace $result2 2>/dev/null $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)" echo "ok $I $name (--replace)"
rm "$diff" rm "$diff"
else else

4
testsuite/tools/simplify-3to4
View File

@@ -22,7 +22,7 @@ for t in ${TESTS[*]}; do
$GTK_BUILDER_TOOL simplify --3to4 $t 2>/dev/null >$result $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" echo "ok $I $name"
rm "$diff" rm "$diff"
else else
@@ -35,7 +35,7 @@ for t in ${TESTS[*]}; do
cp $t $result2 cp $t $result2
$GTK_BUILDER_TOOL simplify --3to4 --replace $result2 2>/dev/null $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)" echo "ok $I $name (--replace)"
rm "$diff" rm "$diff"
else else

2
testsuite/tools/validate
View File

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