diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-07 13:35:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-07 13:35:19 -0700 |
| commit | c1c9f0fbe22e9fb03d892c30970f6c3f583cad47 (patch) | |
| tree | ad8da423e0feaf03cdc0e5af40de178ef0ffa701 | |
| parent | 4f43490a99e41dce2cf8a5a34e154d08889bcb52 (diff) | |
zeromq: cleanup QA code, still needs have ZMQ_LINGER set to zero
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/__init__.py | 1 | ||||
| -rw-r--r-- | gr-zeromq/python/zeromq/CMakeLists.txt | 17 | ||||
| -rwxr-xr-x | gr-zeromq/python/zeromq/qa_zeromq_pushpull.py | 13 | ||||
| -rwxr-xr-x | gr-zeromq/python/zeromq/qa_zeromq_reqrep.py | 6 |
4 files changed, 21 insertions, 16 deletions
diff --git a/gnuradio-runtime/python/gnuradio/__init__.py b/gnuradio-runtime/python/gnuradio/__init__.py index 1e2966bd08..39886272de 100644 --- a/gnuradio-runtime/python/gnuradio/__init__.py +++ b/gnuradio-runtime/python/gnuradio/__init__.py @@ -48,3 +48,4 @@ if path.endswith(path_ending): __path__.append(os.path.join(build_path, 'gr-fec', 'python')) __path__.append(os.path.join(build_path, 'gr-utils', 'python')) __path__.append(os.path.join(build_path, 'gr-uhd', 'python')) + __path__.append(os.path.join(build_path, 'gr-zeromq', 'python')) diff --git a/gr-zeromq/python/zeromq/CMakeLists.txt b/gr-zeromq/python/zeromq/CMakeLists.txt index 9185682592..66fc65a4b5 100644 --- a/gr-zeromq/python/zeromq/CMakeLists.txt +++ b/gr-zeromq/python/zeromq/CMakeLists.txt @@ -39,7 +39,18 @@ GR_PYTHON_INSTALL( ######################################################################## # Handle the unit tests ######################################################################## -include(GrTest) +if(ENABLE_TESTING) -set(GR_TEST_TARGET_DEPS gnuradio-zeromq) -set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig) + set(GR_TEST_TARGET_DEPS "") + set(GR_TEST_LIBRARY_DIRS "") + set(GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gnuradio-runtime/python + ) + + include(GrTest) + file(GLOB py_qa_test_files "qa_*.py") + foreach(py_qa_test_file ${py_qa_test_files}) + get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) + endforeach(py_qa_test_file) +endif(ENABLE_TESTING) diff --git a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py index 72c024e6a2..86b85d9c1d 100755 --- a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # -# Copyright 202013 Free Software Foundation, Inc. +# Copyright 2014 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,9 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -from gnuradio import blocks, zeromq -from gnuradio import eng_notation +from gnuradio import gr, gr_unittest, blocks, zeromq class qa_zeromq_pushpull (gr_unittest.TestCase): @@ -35,12 +32,10 @@ class qa_zeromq_pushpull (gr_unittest.TestCase): def test_001_t (self): src_data = [1,2,3,4,5,6,7,8,9]*100 - print src_data src = blocks.vector_source_c(src_data, False, 1) - zeromq_push_sink = zeromq.push_sink(gr.sizeof_gr_complex, 1, "tcp://*:5555", True) - zeromq_pull_source = zeromq.pull_source(gr.sizeof_gr_complex, 1, "tcp://localhost:5555", 0.1) + zeromq_push_sink = zeromq.push_sink(gr.sizeof_gr_complex, 1, "tcp://127.0.0.1:5555", True) + zeromq_pull_source = zeromq.pull_source(gr.sizeof_gr_complex, 1, "tcp://127.0.0.1:5555", 0.1) sink = blocks.vector_sink_c() -# print sink.data self.tb.connect(src, zeromq_push_sink) self.tb.connect(zeromq_pull_source, sink) self.tb.run () diff --git a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py index e52047253d..85e312145c 100755 --- a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py @@ -35,12 +35,10 @@ class qa_zeromq_reqrep (gr_unittest.TestCase): def test_001_t (self): src_data = [1,2,3,4,5,6,7,8,9]*100 - print src_data src = blocks.vector_source_c(src_data, False, 1) - zeromq_rep_sink = zeromq.rep_sink(gr.sizeof_gr_complex, 1, "tcp://*:5555", 0.1, True) - zeromq_req_source = zeromq.req_source(gr.sizeof_gr_complex, 1, "tcp://localhost:5555") + zeromq_rep_sink = zeromq.rep_sink(gr.sizeof_gr_complex, 1, "tcp://127.0.0.1:5555", 0.1, True) + zeromq_req_source = zeromq.req_source(gr.sizeof_gr_complex, 1, "tcp://127.0.0.1:5555") sink = blocks.vector_sink_c() -# print sink.data self.tb.connect(src, zeromq_rep_sink) self.tb.connect(zeromq_req_source, sink) self.tb.run () |