[gvfs] test/run-in-tree.sh: Re-fix for distcheck
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] test/run-in-tree.sh: Re-fix for distcheck
- Date: Fri, 12 Oct 2012 10:47:24 +0000 (UTC)
commit 5ab00893ea26a20d9b4073557a56bb2de37376c9
Author: Martin Pitt <martinpitt gnome org>
Date: Fri Oct 12 12:46:46 2012 +0200
test/run-in-tree.sh: Re-fix for distcheck
distcheck does an out-of-tree build and thus the generated session.conf is not
in the same directory as run-in-tree.sh. So handle this case separately.
test/run-in-tree.sh | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/test/run-in-tree.sh b/test/run-in-tree.sh
index 5c1c0ca..db39446 100755
--- a/test/run-in-tree.sh
+++ b/test/run-in-tree.sh
@@ -12,7 +12,13 @@ export GVFS_MONITOR_DIR=`pwd`
export PATH=`pwd`/../programs:$PATH
export GIO_EXTRA_MODULES=`pwd`/../client/.libs:`pwd`/../monitor/proxy/.libs
-DBUS_CONF=`dirname $0`/session.conf
+if [ -e $(pwd)/session.conf ]; then
+ # case for out-of tree build (distcheck)
+ DBUS_CONF=`pwd`/session.conf
+else
+ # case for calling this manually in a built tree
+ DBUS_CONF=`dirname $0`/session.conf
+fi
# Start a custom session dbus
PIDFILE=`mktemp`
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]