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_gr_block.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_gr_block.cc')
| -rw-r--r-- | gr-blocks/lib/qa_gr_block.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gr-blocks/lib/qa_gr_block.cc b/gr-blocks/lib/qa_gr_block.cc index 3e93c3db73..36ec128b6e 100644 --- a/gr-blocks/lib/qa_gr_block.cc +++ b/gr-blocks/lib/qa_gr_block.cc @@ -26,7 +26,6 @@ #include <qa_gr_block.h> #include <gnuradio/block.h> -#include <gnuradio/io_signature.h> #include <gnuradio/blocks/null_sink.h> #include <gnuradio/blocks/null_source.h> @@ -64,7 +63,7 @@ qa_gr_block::t1 () CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->min_streams ()); CPPUNIT_ASSERT_EQUAL (-1, dst1->input_signature()->max_streams ()); CPPUNIT_ASSERT_EQUAL ((int) sizeof (int), - dst1->input_signature()->sizeof_stream_item (0)); + dst1->input_signature()->sizeof_stream_item (0)); CPPUNIT_ASSERT_EQUAL (0, dst1->output_signature()->max_streams ()); @@ -73,7 +72,7 @@ qa_gr_block::t1 () CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->min_streams ()); CPPUNIT_ASSERT_EQUAL (-1, dst2->input_signature()->max_streams ()); CPPUNIT_ASSERT_EQUAL ((int) sizeof (short), - dst2->input_signature()->sizeof_stream_item (0)); + dst2->input_signature()->sizeof_stream_item (0)); CPPUNIT_ASSERT_EQUAL (0, dst2->output_signature()->max_streams ()); } |