Skip to content

Commit 6d3d74c

Browse files
The CRLF I think is on disk, not on the QEMU output
1 parent c9b4c83 commit 6d3d74c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tests.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ mps3_an536_cargo="--manifest-path examples/mps3-an536/Cargo.toml"
2626
my_diff() {
2727
file_a=$1
2828
file_b=$2
29-
# Fix Windows path separators (\\) in the output to look like UNIX ones (/)
30-
# and convert CRLF to LF
31-
diff $file_a <(cat $file_b | sed 's~\\\\~/~g' | tr -d '\r')
29+
# - Fix Windows path separators (\\) to look like UNIX ones (/) in the QEMU
30+
# output
31+
# - Fix the CRLF line endings in the files on disk, because git adds them to
32+
# text files.
33+
diff <(cat $file_a | tr -d '\r') <(cat $file_b | sed 's~\\\\~/~g')
3234
}
3335

3436
# armv7r-none-eabi tests

0 commit comments

Comments
 (0)