projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::filesystem to wrap filesystem calls and fix_long_path
[dcpomatic.git]
/
test
/
zipper_test.cc
diff --git
a/test/zipper_test.cc
b/test/zipper_test.cc
index 1b8c386f4356e369090266be63e51a4f8abc5f1a..37e6176f0d322882df7694a9628f4b10c20d302a 100644
(file)
--- 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 "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>
#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 ();
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)
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)