From 27fa202b5e0bdc4543a06bfceaad89bd3f58cff7 Mon Sep 17 00:00:00 2001
From: Joerg Mayer <jmayer@loplof.de>
Date: Wed, 5 Nov 2014 21:00:26 +0100
Subject: Make it easier to run tests out of tree.

Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac
Reviewed-on: https://code.wireshark.org/review/5148
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 test/test.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/test.sh b/test/test.sh
index abc3969dc2..b3651f5591 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -61,9 +61,14 @@ FIN
         exit 0
 fi
 
-source test-backend.sh
-
-source config.sh
+MYDIR=$(dirname $0)
+THISBINDIR=$(cd run && pwd)
+if [ -e $THISBINDIR/tshark -o -e $THISBINDIR/dumpcap -o -e $THISBINDIR/rawshark ]; then
+	WS_BIN_PATH=${WS_BIN_PATH:-$THISBINDIR}
+	WS_QT_BIN_PATH=${WS_QT_BIN_PATH:-$THISBINDIR}
+fi
+source $MYDIR/test-backend.sh
+source $MYDIR/config.sh
 
 # needed by some tests
 TEST_OUTDIR=$(mktemp -d)
-- 
cgit v1.2.3