[Pkg-mozext-commits] [requestpolicy] 04/257: get `run-xpcshell-tests.sh` to work

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit a09816e0d32f7cec79804418d669b2f45f5d9800
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Jul 27 21:58:08 2015 +0200

    get `run-xpcshell-tests.sh` to work
    
    * correctly search for the `obj-*` directory
    * use `PYTHONPATH` instead of `pythonpath.py`
---
 tests/run-xpcshell-tests.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/run-xpcshell-tests.sh b/tests/run-xpcshell-tests.sh
index d1a7dfa..ca48317 100755
--- a/tests/run-xpcshell-tests.sh
+++ b/tests/run-xpcshell-tests.sh
@@ -3,7 +3,7 @@
 TEST_DIR=`dirname $0`/xpcshell
 
 MOZ_SRC_DIR=/moz/mozilla-central
-MOZ_OBJ_DIR=$MOZ_SRC_DIR/obj-*
+MOZ_OBJ_DIR=($MOZ_SRC_DIR/obj-*)
 MOZ_BIN_DIR=$MOZ_OBJ_DIR/dist/bin
 
 ARGUMENTS=""
@@ -18,11 +18,16 @@ else
   ARGUMENTS=" --test-path=$1 "
 fi
 
-python -u $MOZ_SRC_DIR/config/pythonpath.py \
-  -I $MOZ_SRC_DIR/build \
-  -I $MOZ_OBJ_DIR/build \
-  -I $MOZ_SRC_DIR/testing/mozbase/mozdebug \
-  $MOZ_SRC_DIR/testing/xpcshell/runxpcshelltests.py  \
+export PYTHONPATH=\
+$MOZ_SRC_DIR/build:\
+$MOZ_OBJ_DIR/build:\
+$MOZ_SRC_DIR/testing/mozbase/mozdebug:\
+$MOZ_SRC_DIR/testing/mozbase/mozinfo:\
+$MOZ_SRC_DIR/testing/mozbase/mozcrash:\
+$MOZ_SRC_DIR/testing/mozbase/mozfile:\
+$MOZ_SRC_DIR/testing/mozbase/mozlog
+
+python2.7 $MOZ_SRC_DIR/testing/xpcshell/runxpcshelltests.py \
   --build-info-json $MOZ_OBJ_DIR/mozinfo.json \
   --no-logfiles \
   $ARGUMENTS \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git