summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichaelld2009-07-22 19:08:18 +0000
committermichaelld2009-07-22 19:08:18 +0000
commit12689e4fe15f9908d1242b63dd33e149f4db40a8 (patch)
tree01f997605253d4fbe4e9dd620583ccf4dc04f3a9
parent2ce8c910b9e315539ec45a8b4f4d92e0d329523a (diff)
downloadgnuradio-12689e4fe15f9908d1242b63dd33e149f4db40a8.tar.gz
gnuradio-12689e4fe15f9908d1242b63dd33e149f4db40a8.tar.bz2
gnuradio-12689e4fe15f9908d1242b63dd33e149f4db40a8.zip
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
-rw-r--r--gr-usrp/src/run_tests.in4
-rw-r--r--gr-usrp2/src/run_tests.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index f9bdc78b6..c03f96e0b 100644
--- 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 99190b81b..3f068256e 100644
--- 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 \