Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / run_tests.sh.in

diff --git a/run_tests.sh.in b/run_tests.sh.in
index 69fbe26dc0758c12fc39a7af13c4d797d2ec86df..1cb8e170adc361f5618a7a1957de934ad9173871 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -13,14 +13,14 @@ abs_top_builddir=@abs_top_builddir@
 # current QA srcdir
 export srcdir=$3
 
-# Where to find my swig generated shared library
-mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
+# Where to find my C++ and swig generated shared libraries
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/lib:$2/lib/.libs:$2/swig:$2/swig/.libs
 
 # Where to find my swig generated python module
 mysrcdir=$1/src:$1/src/lib
 
 # Where to find my hand written python modules
-mypydir=$1/src:$1/src/python
+mypydir=$1/src:$1/src/python:$1/python
 
 # Where to find core's swig generated shared libraries,
 # and hand generated swig glue
@@ -56,9 +56,6 @@ fi
 PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$PYTHONPATH"
 export PYTHONPATH
 
-# Where to find omnithread library files
-gromnidir=@omnithread_LIBDIRPATH@
-
 # Where to find gruel library files
 grueldir=@gruel_LIBDIRPATH@
 
@@ -68,7 +65,7 @@ grcoredir=@gnuradio_core_LIBDIRPATH@
 # Construct search path for python modules
 # Check each one to make sure it's not "" before adding
 grlibdir=""
-for dir in $gromnidir $grcoredir $grueldir
+for dir in $grcoredir $grueldir
 do
     if [ "$dir" != "" ]
     then