/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
/** @file test/zipper_test.cc
- * @brief Tests of Zipper class.
+ * @brief Test Zipper class.
* @ingroup selfcontained
*/
-#include "lib/zipper.h"
+
#include "lib/exceptions.h"
+#include "lib/zipper.h"
#include "test.h"
#include <dcp/util.h>
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
+
/** Basic test of Zipper working normally */
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");
- BOOST_REQUIRE (r == 0);
+#endif
+ BOOST_REQUIRE_EQUAL (r, 0);
BOOST_CHECK_EQUAL (dcp::file_to_string("build/test/zipper_test1/foo.txt"), "1234567890");
BOOST_CHECK_EQUAL (dcp::file_to_string("build/test/zipper_test1/bar.txt"), "xxxxxxCCCCbbbbbbb1");