diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-03-17 11:43:10 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-17 11:43:10 -0400 |
commit | ee2b700f72503d6e7f62adbfb7dff9997b9cb003 (patch) | |
tree | 2c7e91d03fb5c605c6deebac9077c1bc41bce13d /gr-blocks/lib/qa_blocks.cc | |
parent | f15400470ce5cb68f5339ead7af726b8bbafd364 (diff) | |
parent | 65d88f0b28e233c82bc4f0c07072085a3d18c163 (diff) |
Merge branch 'master' into next
Conflicts:
gr-blocks/swig/blocks_swig.i
Diffstat (limited to 'gr-blocks/lib/qa_blocks.cc')
-rw-r--r-- | gr-blocks/lib/qa_blocks.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-blocks/lib/qa_blocks.cc b/gr-blocks/lib/qa_blocks.cc index fbae11d264..ebf5d3c349 100644 --- a/gr-blocks/lib/qa_blocks.cc +++ b/gr-blocks/lib/qa_blocks.cc @@ -26,18 +26,22 @@ */ #include <qa_blocks.h> +#include <qa_block_tags.h> #include <qa_fxpt.h> #include <qa_fxpt_nco.h> #include <qa_fxpt_vco.h> +#include <qa_rotator.h> CppUnit::TestSuite * qa_gr_blocks::suite() { CppUnit::TestSuite *s = new CppUnit::TestSuite("gr-blocks"); + s->addTest(qa_block_tags::suite()); s->addTest(qa_fxpt::suite()); s->addTest(qa_fxpt_nco::suite()); s->addTest(qa_fxpt_vco::suite()); + s->addTest(qa_rotator::suite()); return s; } |