diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:55:01 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:55:01 -0400 |
| commit | 3e33c4655ca02d831ecef17f30264afc962965af (patch) | |
| tree | 41d2942b358a8f73446604abca29b8e0810c545a | |
| parent | ef350c1648c9c97ce57c382c494742c312b2847d (diff) | |
audio: minor master merge fix.
blocks: fix QA to turn off controlport (should generalize this).
| -rw-r--r-- | gr-audio/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-blocks/python/qa_file_source_sink.py | 1 | ||||
| -rw-r--r-- | gr-blocks/python/qa_udp_source_sink.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index 36acd8f43b..73977752f3 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -33,7 +33,7 @@ link_directories(${Boost_LIBRARY_DIRS}) link_directories(${LOG4CPP_LIBRARY_DIRS}) list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES}) -list(APPEND gr_audio_sources gr_audio_registry.cc) +list(APPEND gr_audio_sources audio_registry.cc) list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf) if(ENABLE_GR_CTRLPORT) diff --git a/gr-blocks/python/qa_file_source_sink.py b/gr-blocks/python/qa_file_source_sink.py index d1d67074d5..2898f760ec 100644 --- a/gr-blocks/python/qa_file_source_sink.py +++ b/gr-blocks/python/qa_file_source_sink.py @@ -27,6 +27,7 @@ import os class test_file_source_sink(gr_unittest.TestCase): def setUp (self): + os.environ['GR_CONF_CONTROLPORT_ON'] = 'False' self.tb = gr.top_block () def tearDown (self): diff --git a/gr-blocks/python/qa_udp_source_sink.py b/gr-blocks/python/qa_udp_source_sink.py index 6ebbf87afc..bd558b2e25 100644 --- a/gr-blocks/python/qa_udp_source_sink.py +++ b/gr-blocks/python/qa_udp_source_sink.py @@ -29,6 +29,7 @@ from threading import Timer class test_udp_sink_source(gr_unittest.TestCase): def setUp(self): + os.environ['GR_CONF_CONTROLPORT_ON'] = 'False' self.tb_snd = gr.top_block() self.tb_rcv = gr.top_block() |