Merge branch 'master' into next
This commit is contained in:
@@ -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
|
### Wireshark Connector
|
||||||
|
|
||||||
This blocks outputs PDUs in the PCAP format which is supported by all common
|
This blocks outputs PDUs in the PCAP format which is supported by all common
|
||||||
|
|||||||
@@ -55,28 +55,3 @@ install(TARGETS gnuradio-foo
|
|||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
|
ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
|
||||||
RUNTIME DESTINATION bin # .dll 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)
|
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -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 <gnuradio/attributes.h>
|
|
||||||
#include <cppunit/TestSuite.h>
|
|
||||||
|
|
||||||
//! 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_ */
|
|
||||||
@@ -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 <cppunit/TextTestRunner.h>
|
|
||||||
#include <cppunit/XmlOutputter.h>
|
|
||||||
|
|
||||||
#include <gnuradio/unittests.h>
|
|
||||||
#include "qa_foo.h"
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user