Avoid the need for diff --strip-trailing-cr in Windows tests

Rangi42 · Jan 29, 2025 · a838a76 · a838a76
1 parent f61019d
commit a838a76
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -138,6 +138,10 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Git config EOL=LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install deps
@@ -275,6 +279,10 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Git config EOL=LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Retrieve binaries

diff --git a/test/asm/test.sh b/test/asm/test.sh
@@ -30,7 +30,7 @@ RGBASM=../../rgbasm
 RGBLINK=../../rgblink
 
 tryDiff () {
-	if ! diff -au --strip-trailing-cr "$1" "$2"; then
+	if ! diff -au "$1" "$2"; then
 		echo "${bold}${red}${i%.asm}${variant}.$3 mismatch!${rescolors}${resbold}"
 		false
 	fi

diff --git a/test/fix/test.sh b/test/fix/test.sh
@@ -25,7 +25,7 @@ rescolors="$(tput op)"
 RGBFIX=./rgbfix
 
 tryDiff () {
-	if ! diff -au --strip-trailing-cr "$1" "$2"; then
+	if ! diff -au "$1" "$2"; then
 		echo "${bold}${red}${3:-$1} mismatch!${rescolors}${resbold}"
 		false
 	fi

diff --git a/test/gfx/test.sh b/test/gfx/test.sh
@@ -83,15 +83,15 @@ for f in *.png; do
 	newTest "$RGBGFX" $flags "$f"
 	if [[ -e "${f%.png}.err" ]]; then
 		runTest 2>"$errtmp"
-		diff -au --strip-trailing-cr "${f%.png}.err" "$errtmp" || failTest
+		diff -au "${f%.png}.err" "$errtmp" || failTest
 	else
 		runTest && checkOutput "${f%.png}" || failTest $?
 	fi
 
 	newTest "$RGBGFX" $flags - "<$f"
 	if [[ -e "${f%.png}.err" ]]; then
 		runTest 2>"$errtmp"
-		diff -au --strip-trailing-cr <(sed "s/$f/<stdin>/g" "${f%.png}.err") "$errtmp" || failTest
+		diff -au <(sed "s/$f/<stdin>/g" "${f%.png}.err") "$errtmp" || failTest
 	else
 		runTest && checkOutput "${f%.png}" || failTest $?
 	fi

diff --git a/test/link/test.sh b/test/link/test.sh
@@ -38,7 +38,7 @@ continueTest () {
 }
 
 tryDiff () {
-	if ! diff -au --strip-trailing-cr "$1" "$2"; then
+	if ! diff -au "$1" "$2"; then
 		echo "${bold}${red}$1 mismatch!${rescolors}${resbold}"
 		false
 	fi