Merge master.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1d8041656cf05e2acaf76081e327c00f7621661b..c233a661ddf4666cb65bd89c68a413d44950fcdb 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,7 +47,7 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
-boost::filesystem::path private_data = boost::filesystem::path ("test") / boost::filesystem::path ("private");
+boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
 class TestUISignaller : public UISignaller
 {
@@ -143,7 +143,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-       if (t == dcp::ERROR) {
+       if (t == dcp::DCP_ERROR) {
                cerr << n << "\n";
        }
 }