From f34cc689839b0c46eb0d9808f1ffd4ff66f99887 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Sun, 7 Aug 2016 13:21:16 +0200 Subject: [PATCH 1/2] delete unused tests --- lib/CMakeLists.txt | 25 ------------------------ lib/qa_foo.cc | 36 ----------------------------------- lib/qa_foo.h | 38 ------------------------------------- lib/test_foo.cc | 47 ---------------------------------------------- 4 files changed, 146 deletions(-) delete mode 100644 lib/qa_foo.cc delete mode 100644 lib/qa_foo.h delete mode 100644 lib/test_foo.cc diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f978d58..e45b9f5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -73,28 +73,3 @@ install(TARGETS gnuradio-foo ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file RUNTIME DESTINATION bin # .dll file ) - -######################################################################## -# Build and register unit test -######################################################################## -include(GrTest) - -include_directories(${CPPUNIT_INCLUDE_DIRS}) - -list(APPEND test_foo_sources - ${CMAKE_CURRENT_SOURCE_DIR}/test_foo.cc - ${CMAKE_CURRENT_SOURCE_DIR}/qa_foo.cc -) - -add_executable(test-foo ${test_foo_sources}) - -target_link_libraries( - test-foo - ${GNURADIO_RUNTIME_LIBRARIES} - ${GNURADIO_PMT_LIBRARIES} - ${Boost_LIBRARIES} - ${CPPUNIT_LIBRARIES} - gnuradio-foo -) - -GR_ADD_TEST(test_foo test-foo) diff --git a/lib/qa_foo.cc b/lib/qa_foo.cc deleted file mode 100644 index d804212..0000000 --- a/lib/qa_foo.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2012 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. - */ - -/* - * This class gathers together all the test cases for the gr-filter - * directory into a single test suite. As you create new test cases, - * add them here. - */ - -#include "qa_foo.h" - -CppUnit::TestSuite * -qa_foo::suite() -{ - CppUnit::TestSuite *s = new CppUnit::TestSuite("foo"); - - return s; -} diff --git a/lib/qa_foo.h b/lib/qa_foo.h deleted file mode 100644 index be40c43..0000000 --- a/lib/qa_foo.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 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. - */ - -#ifndef _QA_FOO_H_ -#define _QA_FOO_H_ - -#include -#include - -//! collect all the tests for the gr-filter directory - -class __GR_ATTR_EXPORT qa_foo -{ - public: - //! return suite of tests for all of gr-filter directory - static CppUnit::TestSuite *suite(); -}; - -#endif /* _QA_FOO_H_ */ diff --git a/lib/test_foo.cc b/lib/test_foo.cc deleted file mode 100644 index 4454389..0000000 --- a/lib/test_foo.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 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 -#include - -#include -#include "qa_foo.h" -#include - -int -main (int argc, char **argv) -{ - CppUnit::TextTestRunner runner; - std::ofstream xmlfile(get_unittest_path("foo.xml").c_str()); - CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - - runner.addTest(qa_foo::suite()); - runner.setOutputter(xmlout); - - bool was_successful = runner.run("", false); - - return was_successful ? 0 : 1; -} From 209f0350f8c95228944d7c52a85017b8b7c14ab5 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Sun, 7 Aug 2016 13:29:28 +0200 Subject: [PATCH 2/2] update readme --- README.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.txt b/README.txt index e9f1fb2..382818e 100644 --- a/README.txt +++ b/README.txt @@ -16,6 +16,13 @@ https://github.com/bastibl/gr-ieee802-15-4 +### Development + +Like GNU Radio, this module uses *master* and *next* branches for development, which are supposed to be used with the corresponding GNU Radio branches. +I recommend staying up-to-date by using the *next* branch. + + + ### Wireshark Connector This blocks outputs PDUs in the PCAP format which is supported by all common