Fix for 'make check' on OSX and Windows; corrects USRP/2 library path.

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

diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index f9bdc78b6d844d6cb0fd84b0eb2a3ba3a90f4330..c03f96e0b63fc47e5dc9235cdb219948e8da14b0 100644 (file)
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -5,11 +5,11 @@
 # 3rd parameter is path to Python QA directory
 
 # For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.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/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH
+PATH=@abs_top_builddir@/usrp/host/lib:@abs_top_builddir@/usrp/host/lib/.libs:$PATH
 
 @top_builddir@/run_tests.sh \
     @abs_top_srcdir@/gr-usrp \

diff --git a/gr-usrp2/src/run_tests.in b/gr-usrp2/src/run_tests.in
index 99190b81b3ddd33c199e1c65056263a5e578c252..3f068256eefe6425416759d3386409bacd0a3ea0 100644 (file)
--- a/gr-usrp2/src/run_tests.in
+++ b/gr-usrp2/src/run_tests.in
@@ -5,11 +5,11 @@
 # 3rd parameter is path to Python QA directory
 
 # For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp2/host/lib/legacy:@abs_top_builddir@/usrp2/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$DYLD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # For Win32
-PATH=@abs_top_builddir@/usrp2/host/lib/legacy:@abs_top_builddir@/usrp2/host/lib/legacy/.libs:$PATH
+PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$PATH
 
 @top_builddir@/run_tests.sh \
     @abs_top_srcdir@/gr-usrp2 \