diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /gr-blocks/python/qa_stream_mux.py | |
parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'gr-blocks/python/qa_stream_mux.py')
-rwxr-xr-x | gr-blocks/python/qa_stream_mux.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-blocks/python/qa_stream_mux.py b/gr-blocks/python/qa_stream_mux.py index f21a9bbbc9..657bd3d63f 100755 --- a/gr-blocks/python/qa_stream_mux.py +++ b/gr-blocks/python/qa_stream_mux.py @@ -22,10 +22,12 @@ from gnuradio import gr, gr_unittest import blocks_swig +import os class test_stream_mux (gr_unittest.TestCase): def setUp (self): + os.environ['GR_CONF_CONTROLPORT_ON'] = 'False' self.tb = gr.top_block () def tearDown (self): |