diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2012-10-12 12:46:46 +0200 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2012-10-12 12:46:46 +0200 |
| commit | 5ab00893ea26a20d9b4073557a56bb2de37376c9 (patch) | |
| tree | 23118b0aeb84150a894bd1be82d0d1fe961f0a0f | |
| parent | 909f82902f6ca89290eba6f454e0b5b56d0d1408 (diff) | |
| download | gvfs-5ab00893ea26a20d9b4073557a56bb2de37376c9.tar.gz | |
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.
| -rwxr-xr-x | 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 5c1c0ca0..db39446f 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` |