X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fzipper_test.cc;h=37e6176f0d322882df7694a9628f4b10c20d302a;hb=96f50dd5e600925488fdd9db1580aa01b026269b;hp=1b8c386f4356e369090266be63e51a4f8abc5f1a;hpb=94a9473993b027b9368077009decbdd4322f90e3;p=dcpomatic.git

diff --git a/test/zipper_test.cc b/test/zipper_test.cc
index 1b8c386f4..37e6176f0 100644
--- a/test/zipper_test.cc
+++ b/test/zipper_test.cc
@@ -28,6 +28,7 @@
 #include "lib/exceptions.h"
 #include "lib/zipper.h"
 #include "test.h"
+#include <dcp/filesystem.h>
 #include <dcp/util.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
@@ -44,6 +45,11 @@ BOOST_AUTO_TEST_CASE (zipper_test1)
 	zipper.add ("bar.txt", "xxxxxxCCCCbbbbbbb1");
 	zipper.close ();
 
+	/* Make sure we aren't in a UNC current working directory otherwise the use of cmd.exe
+	 * in system() below will fail.
+	 */
+	boost::filesystem::current_path(dcp::filesystem::unfix_long_path(boost::filesystem::current_path()));
+
 	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)