summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-02-09 16:28:16 -0800
committerJosh Blum <josh@joshknows.com>2010-02-09 16:28:16 -0800
commitc5480830c6e8e8e862523b3ebf3117fda8a100df (patch)
tree65aac999502e58efe5cdfad71bef7ddc3d201444 /test
parentdfd7f99eecefc19effd97034048641de9d6b7e94 (diff)
downloaduhd-c5480830c6e8e8e862523b3ebf3117fda8a100df.tar.gz
uhd-c5480830c6e8e8e862523b3ebf3117fda8a100df.tar.bz2
uhd-c5480830c6e8e8e862523b3ebf3117fda8a100df.zip
renamed usrp_uhd to uhd
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/addr_test.cpp4
-rw-r--r--test/device_test.cpp4
-rw-r--r--test/gain_handler_test.cpp6
-rw-r--r--test/usrp_dboard_test.cpp4
-rw-r--r--test/wax_test.cpp2
6 files changed, 11 insertions, 11 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 83214efec..a010c15cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
LDADD = \
$(GENERAL_LDDFLAGS) \
$(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
- $(USRP_UHD_LA)
+ $(UHD_LA)
noinst_PROGRAMS = main_test
diff --git a/test/addr_test.cpp b/test/addr_test.cpp
index c5823cc65..148aee015 100644
--- a/test/addr_test.cpp
+++ b/test/addr_test.cpp
@@ -16,12 +16,12 @@
//
#include <boost/test/unit_test.hpp>
-#include <usrp_uhd/device_addr.hpp>
+#include <uhd/device_addr.hpp>
BOOST_AUTO_TEST_CASE(test_mac_addr){
std::cout << "Testing mac addr..." << std::endl;
const std::string mac_addr_str("00:01:23:45:67:89");
- usrp_uhd::mac_addr_t mac_addr(mac_addr_str);
+ uhd::mac_addr_t mac_addr(mac_addr_str);
std::cout << "Input: " << mac_addr_str << std::endl;
std::cout << "Output: " << mac_addr << std::endl;
BOOST_CHECK_EQUAL(mac_addr_str, mac_addr.to_string());
diff --git a/test/device_test.cpp b/test/device_test.cpp
index 328ea9c0c..a868cf9f6 100644
--- a/test/device_test.cpp
+++ b/test/device_test.cpp
@@ -16,9 +16,9 @@
//
#include <boost/test/unit_test.hpp>
-#include <usrp_uhd/device.hpp>
+#include <uhd/device.hpp>
-using namespace usrp_uhd;
+using namespace uhd;
BOOST_AUTO_TEST_CASE(test_device){
device_addr_t device_addr(DEVICE_ADDR_TYPE_VIRTUAL);
diff --git a/test/gain_handler_test.cpp b/test/gain_handler_test.cpp
index 074a67ec8..30e88c445 100644
--- a/test/gain_handler_test.cpp
+++ b/test/gain_handler_test.cpp
@@ -16,11 +16,11 @@
//
#include <boost/test/unit_test.hpp>
-#include <usrp_uhd/gain_handler.hpp>
-#include <usrp_uhd/utils.hpp>
+#include <uhd/gain_handler.hpp>
+#include <uhd/utils.hpp>
#include <iostream>
-using namespace usrp_uhd;
+using namespace uhd;
enum prop_t{
PROP_GAIN,
diff --git a/test/usrp_dboard_test.cpp b/test/usrp_dboard_test.cpp
index 5bd086dc1..a66dfd190 100644
--- a/test/usrp_dboard_test.cpp
+++ b/test/usrp_dboard_test.cpp
@@ -16,9 +16,9 @@
//
#include <boost/test/unit_test.hpp>
-#include <usrp_uhd/usrp/dboard/manager.hpp>
+#include <uhd/usrp/dboard/manager.hpp>
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
/***********************************************************************
* dummy interface for dboards
diff --git a/test/wax_test.cpp b/test/wax_test.cpp
index de66a9f64..f51860c13 100644
--- a/test/wax_test.cpp
+++ b/test/wax_test.cpp
@@ -16,7 +16,7 @@
//
#include <boost/test/unit_test.hpp>
-#include <usrp_uhd/wax.hpp>
+#include <uhd/wax.hpp>
enum opt_a_t{OPTION_A_0, OPTION_A_1};
enum opt_b_t{OPTION_B_0, OPTION_B_1};