From 39d51cddeeea82e602ab1925430b0dfb5752ac79 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Feb 2021 00:18:35 +0100 Subject: [PATCH] Avoid using unzip.exe for Windows tests, as it crashes quite a lot for some reason. --- test/zipper_test.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/zipper_test.cc b/test/zipper_test.cc index 1ec7ff80b..c3f6ef728 100644 --- a/test/zipper_test.cc +++ b/test/zipper_test.cc @@ -42,7 +42,15 @@ BOOST_AUTO_TEST_CASE (zipper_test1) zipper.close (); boost::filesystem::remove_all ("build/test/zipper_test1", ec); +#ifdef DCPOMATIC_WINDOWS + /* unzip on windows crashes every so often (with a return code -1073740940, for some reason) + * so try using the built-in tar which can unzip things. + */ + boost::filesystem::create_directories ("build/test/zipper_test1"); + int const r = system ("tar -xf build\\test\\zipped.zip -C build\\test\\zipper_test1"); +#else int const r = system ("unzip build/test/zipped.zip -d build/test/zipper_test1"); +#endif BOOST_REQUIRE_EQUAL (r, 0); BOOST_CHECK_EQUAL (dcp::file_to_string("build/test/zipper_test1/foo.txt"), "1234567890"); -- 2.30.2