diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-01 13:41:04 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:25:12 -0700 |
| commit | 9e2eef3cfc7ead637e578eed73e8f33f24d3ed8a (patch) | |
| tree | 69563d65ba2bb380939f15f71891e3dfdfc2f0a3 /gnuradio-runtime/lib | |
| parent | 5672d2a4082a40a12f96362d59b16b47b9d3ce09 (diff) | |
build: removed last references to GRUEL.
Also update qa_runtime to pull in qa_pmt tests.
Diffstat (limited to 'gnuradio-runtime/lib')
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/qa_pmt.cc | 8 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/test_runtime.cc | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 1767920b5d..5e7e0a1800 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -214,7 +214,6 @@ endif(TRY_SHM_VMCIRCBUF) add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources}) target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") -#set_target_properties(gnuradio-runtime PROPERTIES LINK_INTERFACE_LIBRARIES "gruel") add_dependencies(gnuradio-runtime runtime_generated_includes @@ -241,6 +240,8 @@ list(APPEND test_gnuradio_runtime_sources qa_gr_vmcircbuf.cc qa_runtime.cc qa_sincos.cc + pmt/qa_pmt.cc + pmt/qa_pmt_prims.cc ) include_directories(${CPPUNIT_INCLUDE_DIRS}) diff --git a/gnuradio-runtime/lib/pmt/qa_pmt.cc b/gnuradio-runtime/lib/pmt/qa_pmt.cc index 27c617e747..a87f97e570 100644 --- a/gnuradio-runtime/lib/pmt/qa_pmt.cc +++ b/gnuradio-runtime/lib/pmt/qa_pmt.cc @@ -29,12 +29,12 @@ #include <qa_pmt_unv.h> CppUnit::TestSuite * -qa_pmt::suite () +qa_pmt::suite() { - CppUnit::TestSuite *s = new CppUnit::TestSuite ("pmt"); + CppUnit::TestSuite *s = new CppUnit::TestSuite("pmt"); - s->addTest (qa_pmt_prims::suite ()); - s->addTest (qa_pmt_unv::suite ()); + s->addTest(qa_pmt_prims::suite()); + s->addTest(qa_pmt_unv::suite()); return s; } diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc index 783cbebc0b..daafca20cd 100644 --- a/gnuradio-runtime/lib/test_runtime.cc +++ b/gnuradio-runtime/lib/test_runtime.cc @@ -29,6 +29,7 @@ #include <gr_unittests.h> #include <qa_runtime.h> +#include <pmt/qa_pmt.h> int main (int argc, char **argv) @@ -37,10 +38,11 @@ main (int argc, char **argv) std::ofstream xmlfile(get_unittest_path("gnuradio_core_runtime.xml").c_str()); CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - runner.addTest (qa_runtime::suite ()); + runner.addTest(qa_runtime::suite()); + runner.addTest(qa_pmt::suite()); runner.setOutputter(xmlout); - bool was_successful = runner.run ("", false); + bool was_successful = runner.run("", false); return was_successful ? 0 : 1; } |