diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-06-21 17:09:09 -0700 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-06-23 00:17:18 +0200 |
| commit | 136fc7225ea99fae34813b0b2968dced6abdf95f (patch) | |
| tree | 3cda7eabb95f2458e6b33c0efe24af6be78d1b8f | |
| parent | be9772fb5a01cff8ade93725031d85a2f029cc35 (diff) | |
fixup! blocks: Replace QA test framework w/ Boost UTF
| -rw-r--r-- | gr-blocks/lib/qa_rotator.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/test_gr_blocks.cc | 48 | ||||
| -rw-r--r-- | gr-blocks/tests/CMakeLists.txt | 2 |
3 files changed, 0 insertions, 52 deletions
diff --git a/gr-blocks/lib/qa_rotator.cc b/gr-blocks/lib/qa_rotator.cc index ae5a135de9..0e567aec8f 100644 --- a/gr-blocks/lib/qa_rotator.cc +++ b/gr-blocks/lib/qa_rotator.cc @@ -65,7 +65,6 @@ BOOST_AUTO_TEST_CASE(t1) #endif BOOST_CHECK(std::abs(expected - actual) <= 0.0001); - //CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected, actual, 0.0001); phase += phase_incr; if(phase >= 2*M_PI) @@ -106,7 +105,6 @@ BOOST_AUTO_TEST_CASE(t2) #endif BOOST_CHECK(std::abs(expected - actual) <= 0.0001); - //CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected, actual, 0.0001); phase += phase_incr; if(phase >= 2*M_PI) diff --git a/gr-blocks/lib/test_gr_blocks.cc b/gr-blocks/lib/test_gr_blocks.cc deleted file mode 100644 index bc3901dac3..0000000000 --- a/gr-blocks/lib/test_gr_blocks.cc +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012-2013 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio 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, or (at your option) - * any later version. - * - * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <cppunit/TextTestRunner.h> -#include <cppunit/XmlOutputter.h> - -#include <gnuradio/unittests.h> -#include <qa_blocks.h> -#include <iostream> -#include <fstream> - -int -main(int argc, char **argv) -{ - CppUnit::TextTestRunner runner; - std::ofstream xmlfile(get_unittest_path("blocks.xml").c_str()); - CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - - runner.addTest(qa_blocks::suite()); - runner.setOutputter(xmlout); - - bool was_successful = runner.run("", false); - - return was_successful ? 0 : 1; -} diff --git a/gr-blocks/tests/CMakeLists.txt b/gr-blocks/tests/CMakeLists.txt index f6b2b50050..a012e2c844 100644 --- a/gr-blocks/tests/CMakeLists.txt +++ b/gr-blocks/tests/CMakeLists.txt @@ -28,12 +28,10 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${CPPUNIT_INCLUDE_DIRS} ) link_directories( ${Boost_LIBRARY_DIRS} - ${CPPUNIT_LIBRARY_DIRS} ) ######################################################################## |