Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into u1e_uhd

Conflicts:
	host/include/uhd/usrp/dboard_id.hpp

3 files changed, 39 insertions, 9 deletions

diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt
index b1d5924c7..1791d9082 100644
--- a/host/test/CMakeLists.txt
+++ b/host/test/CMakeLists.txt
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-
+########################################################################
+# unit test suite
+########################################################################
 ADD_EXECUTABLE(main_test
     main_test.cpp
     addr_test.cpp
@@ -23,7 +25,10 @@ ADD_EXECUTABLE(main_test
     vrt_test.cpp
     wax_test.cpp
 )
-
 TARGET_LINK_LIBRARIES(main_test uhd)
-
 ADD_TEST(test main_test)
+
+########################################################################
+# demo of a loadable module
+########################################################################
+ADD_LIBRARY(module_test MODULE module_test.cpp)
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp
index a4005c0de..47acb30f0 100644
--- a/host/test/gain_handler_test.cpp
+++ b/host/test/gain_handler_test.cpp
@@ -17,6 +17,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <uhd/gain_handler.hpp>
+#include <uhd/types.hpp>
 #include <uhd/props.hpp>
 #include <uhd/dict.hpp>
 #include <boost/bind.hpp>
@@ -108,12 +109,10 @@ BOOST_AUTO_TEST_CASE(test_gain_handler){
     );
 
     std::cout << "verifying the overall min, max, step" << std::endl;
-    gain_t gain_min, gain_max, gain_step;
-    boost::tie(gain_min, gain_max, gain_step) = \
-        go0[PROP_GAIN_RANGE].as<gain_range_t>();
-    BOOST_CHECK_EQUAL(gain_min, gain_t(-10));
-    BOOST_CHECK_EQUAL(gain_max, gain_t(100));
-    BOOST_CHECK_EQUAL(gain_step, gain_t(1.5));
+    gain_range_t gain = go0[PROP_GAIN_RANGE].as<gain_range_t>();
+    BOOST_CHECK_EQUAL(gain.min, gain_t(-10));
+    BOOST_CHECK_EQUAL(gain.max, gain_t(100));
+    BOOST_CHECK_EQUAL(gain.step, gain_t(1.5));
 
     std::cout << "verifying the overall gain" << std::endl;
     go0[named_prop_t(PROP_GAIN_VALUE, "g0")] = gain_t(-5);
diff --git a/host/test/module_test.cpp b/host/test/module_test.cpp
new file mode 100644
index 000000000..71721ef90
--- /dev/null
+++ b/host/test/module_test.cpp
@@ -0,0 +1,26 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils.hpp>
+#include <iostream>
+
+STATIC_BLOCK(module_test){
+    std::cout << "---------------------------------------" << std::endl;
+    std::cout << "-- Good news, everyone!" << std::endl;
+    std::cout << "-- The test module has been loaded." << std::endl;
+    std::cout << "---------------------------------------" << std::endl;
+}