diff options
| author | Doug Geiger <doug.geiger@bioradiation.net> | 2015-07-07 17:27:35 -0400 |
|---|---|---|
| committer | Doug Geiger <doug.geiger@bioradiation.net> | 2015-07-09 11:19:07 -0400 |
| commit | 8db71d32b22b95264c9a090aa5ddc7048496f94b (patch) | |
| tree | 037d4b2f8ca8852202f8ff797465ef0b1b562d4b /gr-blocks/lib/qa_set_msg_handler.cc | |
| parent | 85f864ec184a0fd1fd0436e11cb2ab1c6cb2bc25 (diff) | |
Re-add qa_gr_flowgraph/qa_set_msg_handler to test suite
During the great shuffling of v3.6->v3.7 qa_gr_flowgraph and qa_set_msg_handler got dropped on the cmake floor.
This commit adds both back into the automated tests (this lives in gr-blocks since it requires the nop/null_source/null_sink blocks).
Both files needed updating to the v3.7+ API (i.e. using gr::<blah> namespace instead of gr_<blah>), also two of the tests in qa_gr_flowgraph were
failing since the null_source and null_sink have since been changed to allow infinite outputs/inputs (i.e. the test that checks the flowgraph connect
checker was failing due to the underlying block allowing multiple ports).
Instead we have to replicate the functionality of the null_sink/source in this file, but only allow a single in/out.
Also removes sine_table.h which lives in gnuradio-runtime since the great re-shuffling of 2013 (the only place it is used in
gnuradio-runtime/lib/math/fxpt.cc, and it does not get installed)
Diffstat (limited to 'gr-blocks/lib/qa_set_msg_handler.cc')
| -rw-r--r-- | gr-blocks/lib/qa_set_msg_handler.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gr-blocks/lib/qa_set_msg_handler.cc b/gr-blocks/lib/qa_set_msg_handler.cc index 47e5698787..c5b463ca63 100644 --- a/gr-blocks/lib/qa_set_msg_handler.cc +++ b/gr-blocks/lib/qa_set_msg_handler.cc @@ -34,9 +34,6 @@ #include <iostream> #include <boost/thread/thread.hpp> - -#define VERBOSE 0 - /* * The gr::block::nop block has been instrumented so that it counts * the number of messages sent to it. We use this feature to confirm @@ -47,13 +44,10 @@ void qa_set_msg_handler::t0() { static const int NMSGS = 10; - if (VERBOSE) std::cout << "qa_set_msg_handler::t0()\n"; - - top_block_sptr tb = make_top_block("top"); - - block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); gr::blocks::nop::sptr nop = gr::blocks::nop::make(sizeof(int)); - block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); tb->connect(src, 0, nop, 0); tb->connect(nop, 0, dst, 0); |