diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b45e9f..8cbc12b 100644 --- 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 index 07b35c6..9460001 100644 --- 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 index 9c49b92..ee9aa54 100644 --- 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 index 5acca16..69e6603 100644 --- 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 index ee1f9f6..11f0288 100644 --- 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 index 2a0a02e..d5cc015 100644 --- 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 --------------------------------------------------