From: Carl Hetherington Date: Wed, 13 May 2015 22:44:41 +0000 (+0100) Subject: Fix test reference after subtitle fixes. X-Git-Tag: v2.0.48~89^2~19 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=edecc975384bfef50418e3fb77e5c4629207ec08 Fix test reference after subtitle fixes. --- diff --git a/run/tests b/run/tests index 9b94ada80..e9c025893 100755 --- a/run/tests +++ b/run/tests @@ -3,6 +3,7 @@ # e.g. --run_tests=foo export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH +export DCPOMATIC_LINUX_SHARE_PREFIX=`pwd` if [ "$1" == "--debug" ]; then shift; gdb --args build/test/unit-tests --catch_system_errors=no $* diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 9894d885f..29591c69f 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -155,6 +155,12 @@ boost::filesystem::path shared_path () { #ifdef DCPOMATIC_LINUX +#ifdef DCPOMATIC_DEBUG + char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX"); + if (p) { + return p; + } +#endif return boost::filesystem::canonical (LINUX_SHARE_PREFIX); #endif #ifdef DCPOMATIC_WINDOWS