Merged r6271:6278 from jcorgan/t182 into trunk. Implements ticket:182.

[debian/gnuradio] / run_tests.sh.in

diff --git a/run_tests.sh.in b/run_tests.sh.in
index abaeae832b875b53b01598d503d64d2de13d8d40..d32d3653ab6e0c6003f709ef3b02545c4e5e8c8d 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -23,21 +23,19 @@ grswigsrcdir=@abs_top_srcdir@/gnuradio-core/src/lib/swig
 # Where to find core's python modules
 grpydir=@abs_top_srcdir@/gnuradio-core/src/python
 
+# Construct search path for python modules
+PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH"
+export PYTHONPATH
+
 # Where to find core's master library files and dependencies
 gromnidir=@abs_top_builddir@/omnithread
 gromnidir=$gromnidir:$gromnidir/.libs
 grcoredir=@abs_top_builddir@/gnuradio-core/src/lib
 grcoredir=$grcoredir:$grcoredir/.libs
-grusrpdir=@abs_top_builddir@/usrp/host/lib
-grusrpdir=$grusrpdir:$grusrpdir/.libs
-grlibdir=$gromnidir:$grcoredir:$grusrpdir
-
-# Construct search path for python modules
-PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH"
-export PYTHONPATH
+grlibdir=$gromnidir:$grcoredir
 
 # For OS/X
-DYLD_LIBRARY_PATH=$grlibdir
+DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # For Win32