From 3838090b44ecf26e18e763216ca2869abf467434 Mon Sep 17 00:00:00 2001
From: Abel Cheung <abelcheung@gmail.com>
Date: Fri, 24 Nov 2023 10:26:18 +0800
Subject: [PATCH] test: Fix ctest failures on Mac and Windows

- Mac iconv lacks EBCDIC support
- Unicode path tests missing EOL flag on MSYS
---
 .github/workflows/check.yml | 2 +-
 test/cmake/encoding.cmake   | 9 +++++++--
 test/cmake/read-write.cmake | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c00f297..8c48e0e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -92,4 +92,4 @@ jobs:
       env:
         MSYS2_PATH_TYPE: inherit
       run: |
-        cd build && ctest --output-on-failure
+        cd build && ctest --output-on-failure -V
diff --git a/test/cmake/encoding.cmake b/test/cmake/encoding.cmake
index 2b1f351..f146e2b 100644
--- a/test/cmake/encoding.cmake
+++ b/test/cmake/encoding.cmake
@@ -56,9 +56,14 @@ set_tests_properties(
 #
 # ASCII incompatible encoding
 #
-add_encoding_test(f_BadEncEBCDIC -DCHOICES=IBM-037|IBM037|CP037 -DINFO2=dummy)
+if(APPLE)
+    # iconv on Mac lacks many encodings
+    add_encoding_test(f_IncompatEnc -DCHOICES=UTF-32 -DINFO2=dummy)
+else()
+    add_encoding_test(f_IncompatEnc -DCHOICES=IBM-037|IBM037|CP037 -DINFO2=dummy)
+endif()
 set_tests_properties(
-    f_BadEncEBCDIC
+    f_IncompatEnc
     PROPERTIES
         LABELS "encoding;info2"
         PASS_REGULAR_EXPRESSION "possibly be a code page or compatible encoding"
diff --git a/test/cmake/read-write.cmake b/test/cmake/read-write.cmake
index 572fe7e..17f6dff 100644
--- a/test/cmake/read-write.cmake
+++ b/test/cmake/read-write.cmake
@@ -114,7 +114,7 @@ function(UniInputPathTest testid is_info2 input ref)
 
     add_test(
         NAME ${prefix}
-        COMMAND ${CMAKE_COMMAND} -E compare_files ${out} ${ref_fullpath})
+        COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${out} ${ref_fullpath})
 
     set_tests_properties(${prefix}_Prep  PROPERTIES FIXTURES_SETUP    ${fixture})
     set_tests_properties(${prefix}_Clean PROPERTIES FIXTURES_CLEANUP  ${fixture})