Fix test cases failing on Windows

Require >= nihtest-1.6 for testing and use its new "stdout-replace" feature to map the differing directory separator back to "/" (for the 4 tests that use zip files in subdirectories). Remove the affected tests from XFAIL_TESTS (all tests pass now).
0-wiz-0 · Apr 10, 2024 · f3c4388 · f3c4388
1 parent d097c5a
commit f3c4388
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ else()
 endif()
 
 find_program(NIHTEST nihtest)
-set(NIHTEST_REQUIRED_VERSION "1.5")
+set(NIHTEST_REQUIRED_VERSION "1.6")
 
 option(RUN_REGRESS "Run regression tests" ON)
 

diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
@@ -1,13 +1,5 @@
 set(XFAIL_TESTS
 )
-if(WIN32)
-  set(XFAIL_TESTS ${XFAIL_TESTS}
-    cli-q.test
-    cli-s.test
-    recurse.test
-    recursive.test
-  )
-endif()
 
 if(RUN_REGRESS)
   file(GLOB TEST_CASES ${CMAKE_CURRENT_SOURCE_DIR}/*.test)

diff --git a/regress/cli-q.test b/regress/cli-q.test
@@ -5,6 +5,8 @@ file dir/another.zip small.zip small.tzip
 file dir/moretorrentzip.zip small.tzip small.tzip
 file dir/sub/one.zip small.zip small.tzip
 file dir/sub/torrentzip.zip small.tzip small.tzip
+stdout-replace '(dir)\\\\' '\1/'
+stdout-replace '(sub)\\\\' '\1/'
 stdout
 Rezipping - dir/another.zip
 --------------------------------------------------

diff --git a/regress/cli-s.test b/regress/cli-s.test
@@ -5,6 +5,7 @@ file dir/another.zip small.zip small.tzip
 file dir/moretorrentzip.zip small.tzip small.tzip
 file dir/sub/one.zip small.zip small.zip
 file dir/sub/torrentzip.zip small.tzip small.tzip
+stdout-replace '(dir)\\\\' '\1/'
 stdout
 Rezipping - dir/another.zip
 --------------------------------------------------

diff --git a/regress/recurse.test b/regress/recurse.test
@@ -5,6 +5,8 @@ file dir/CaSe.ZiP small.zip small.tzip
 file dir/p small.zip
 file dir/skip.bin small.zip
 file dir/sub/small.zip small.zip small.tzip
+stdout-replace '(dir)\\\\' '\1/'
+stdout-replace '(sub)\\\\' '\1/'
 stdout
 Rezipping - dir/CaSe.ZiP
 --------------------------------------------------

diff --git a/regress/recursive.test b/regress/recursive.test
@@ -5,6 +5,8 @@ file dir/another.zip small.zip small.tzip
 file dir/moretorrentzip.zip small.tzip small.tzip
 file dir/sub/one.zip small.zip small.tzip
 file dir/sub/torrentzip.zip small.tzip small.tzip
+stdout-replace '(dir)\\\\' '\1/'
+stdout-replace '(sub)\\\\' '\1/'
 stdout
 Rezipping - dir/another.zip
 --------------------------------------------------