Ignore Windows line endings

jonathanpallant · jonathanpallant · commit 8a76834a6ec8 · 2025-04-04T16:26:57.000+01:00
diff --git a/tests.sh b/tests.sh
@@ -27,7 +27,8 @@ my_diff() {
     file_a=$1
     file_b=$2
     # Fix Windows path separators (\\) in the output to look like UNIX ones (/)
-    diff $file_a <(cat $file_b | sed 's~\\\\~/~g')
+    # and convert CRLF to LF
+    diff $file_a <(cat $file_b | sed 's~\\\\~/~g' | tr -d '\r')
 }
 
 # armv7r-none-eabi tests

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ my_diff() {`
`27`	`27`	`file_a=$1`
`28`	`28`	`file_b=$2`
`29`	`29`	`# Fix Windows path separators (\\) in the output to look like UNIX ones (/)`
`30`		`- diff $file_a <(cat $file_b \| sed 's~\\\\~/~g')`
	`30`	`+ # and convert CRLF to LF`
	`31`	`+ diff $file_a <(cat $file_b \| sed 's~\\\\~/~g' \| tr -d '\r')`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`# armv7r-none-eabi tests`