summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-27 20:25:13 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-27 20:25:13 +0000
commit363dee03e61d65538841541028ed62c91ffca124 (patch)
tree1950da00f810763d7e667a07132f1899392dfd91
parenta69d242f3f00207d6ea7320e6723775f4b0dbfb3 (diff)
Remove relative path elements from test location.
-rw-r--r--src/lib/job.cc2
-rw-r--r--test/test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 5134475ce..65e2567cc 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -176,7 +176,7 @@ Job::run_wrapper ()
} catch (dcp::DCPReadError& e) {
- set_error (e.message(), e.detail().get_value_or(""));
+ set_error (e.what(), "");//message(), e.detail().get_value_or(""));
set_progress (1);
set_state (FINISHED_ERROR);
diff --git a/test/test.cc b/test/test.cc
index f829a86f6..53a561aa3 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -69,7 +69,7 @@ using boost::shared_ptr;
using boost::scoped_array;
using boost::dynamic_pointer_cast;
-boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
+boost::filesystem::path private_data = boost::filesystem::absolute(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
void
setup_test_config ()