True fix for ticket:140.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4597 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index 243d57b745974dd401a320800a5792a3bba96886..49e9530cbe6a51728056446d8b52ab2cc4bd0e0d 100644 (file)
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -5,7 +5,8 @@
 # 3rd parameter is path to Python QA directory
 
 # For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/.libs:$DYLD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/:@abs_top_builddir@/usrp/host/lib/.libs:$DYLD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
 
 # For Win32
 PATH=@abs_top_builddir@/usrp/host/lib/.libs:$PATH

diff --git a/run_tests.sh.in b/run_tests.sh.in
index 37c0a9925f468891bb7f16379bb3e721807d80ca..d32d3653ab6e0c6003f709ef3b02545c4e5e8c8d 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -35,7 +35,7 @@ grcoredir=$grcoredir:$grcoredir/.libs
 grlibdir=$gromnidir:$grcoredir
 
 # For OS/X
-DYLD_LIBRARY_PATH=$grlibdir
+DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # For Win32