diff options
31 files changed, 76 insertions, 118 deletions
diff --git a/gr-digital/python/digital/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt index 7f35e3c2be..8162c6fe20 100644 --- a/gr-digital/python/digital/CMakeLists.txt +++ b/gr-digital/python/digital/CMakeLists.txt @@ -64,22 +64,17 @@ GR_PYTHON_INSTALL( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-digital/python - ${CMAKE_BINARY_DIR}/gr-digital/swig - ${CMAKE_BINARY_DIR}/gr-filter/python - ${CMAKE_BINARY_DIR}/gr-filter/swig - ${CMAKE_BINARY_DIR}/gr-analog/python - ${CMAKE_BINARY_DIR}/gr-analog/swig - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft gnuradio-analog) + set(GR_TEST_TARGET_DEPS "") + set(GR_TEST_LIBRARY_DIRS "") + set(GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gruel/src/python + ${CMAKE_BINARY_DIR}/gnuradio-core/src/python + ) -include(GrTest) -file(GLOB py_qa_test_files "qa_*.py") -foreach(py_qa_test_file ${py_qa_test_files}) + 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} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) -endforeach(py_qa_test_file) + endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-digital/python/digital/gmsk.py b/gr-digital/python/digital/gmsk.py index a90e49a521..53a5640259 100644 --- a/gr-digital/python/digital/gmsk.py +++ b/gr-digital/python/digital/gmsk.py @@ -24,21 +24,15 @@ # See gnuradio-examples/python/digital for examples -from gnuradio import gr -from gnuradio import blocks -from gnuradio import analog -import modulation_utils -import digital_swig as digital from math import pi -import numpy from pprint import pprint import inspect -try: - from gnuradio import filter -except ImportError: - import filter_swig as filter +import numpy +from gnuradio import gr, blocks, analog, filter +import modulation_utils +import digital_swig as digital # default values (used in __init__ and add_options) _def_samples_per_symbol = 2 diff --git a/gr-digital/python/digital/qa_binary_slicer_fb.py b/gr-digital/python/digital/qa_binary_slicer_fb.py index 22f7da73ff..162fd73f8e 100755 --- a/gr-digital/python/digital/qa_binary_slicer_fb.py +++ b/gr-digital/python/digital/qa_binary_slicer_fb.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital + import math, random class test_binary_slicer_fb(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_chunks_to_symbols.py b/gr-digital/python/digital/qa_chunks_to_symbols.py index 5ffe425132..aab5a5addd 100755 --- a/gr-digital/python/digital/qa_chunks_to_symbols.py +++ b/gr-digital/python/digital/qa_chunks_to_symbols.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_chunks_to_symbols(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_clock_recovery_mm.py b/gr-digital/python/digital/qa_clock_recovery_mm.py index e904cf4c21..b9e9121c32 100755 --- a/gr-digital/python/digital/qa_clock_recovery_mm.py +++ b/gr-digital/python/digital/qa_clock_recovery_mm.py @@ -20,9 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import random, cmath +import random +import cmath + +from gnuradio import gr, gr_unittest, digital class test_clock_recovery_mm(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_cma_equalizer.py b/gr-digital/python/digital/qa_cma_equalizer.py index f71e199189..7335c0f918 100755 --- a/gr-digital/python/digital/qa_cma_equalizer.py +++ b/gr-digital/python/digital/qa_cma_equalizer.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_cma_equalizer_fir(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py index a593c3ea3e..709debb2b9 100755 --- a/gr-digital/python/digital/qa_constellation.py +++ b/gr-digital/python/digital/qa_constellation.py @@ -23,15 +23,9 @@ import random from cmath import exp, pi, log -from gnuradio import gr, gr_unittest -from utils import mod_codes -import digital_swig as digital -import blocks_swig as blocks - -# import from local folder -import psk -import qam -import qamlike +from gnuradio import gr, gr_unittest, digital, blocks +from gnuradio.digital.utils import mod_codes +from gnuradio.digital import psk, qam, qamlike tested_mod_codes = (mod_codes.NO_CODE, mod_codes.GRAY_CODE) diff --git a/gr-digital/python/digital/qa_constellation_decoder_cb.py b/gr-digital/python/digital/qa_constellation_decoder_cb.py index 6a93b6e743..1c910feacb 100755 --- a/gr-digital/python/digital/qa_constellation_decoder_cb.py +++ b/gr-digital/python/digital/qa_constellation_decoder_cb.py @@ -20,9 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import math +from gnuradio import gr, gr_unittest, digital class test_constellation_decoder(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py index bc44220ea9..914e347d88 100755 --- a/gr-digital/python/digital/qa_constellation_receiver.py +++ b/gr-digital/python/digital/qa_constellation_receiver.py @@ -21,19 +21,15 @@ # import random +import math -from gnuradio import gr, gr_unittest -from utils import mod_codes, alignment -import packet_utils -import filter_swig as filter -import analog_swig as analog -import blocks_swig as blocks -from generic_mod_demod import generic_mod, generic_demod +from gnuradio import gr, gr_unittest, filter, analog, blocks, digital +from gnuradio.digital.utils import mod_codes, alignment +from gnuradio.digital import packet_utils +from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod from qa_constellation import tested_constellations, twod_constell -import math - # Set a seed so that if errors turn up they are reproducible. SEED = 1239 diff --git a/gr-digital/python/digital/qa_correlate_access_code.py b/gr-digital/python/digital/qa_correlate_access_code.py index 5a5f2209f7..849ca474a9 100755 --- a/gr-digital/python/digital/qa_correlate_access_code.py +++ b/gr-digital/python/digital/qa_correlate_access_code.py @@ -20,10 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital import math +from gnuradio import gr, gr_unittest, digital + default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC' def string_to_1_0_list(s): diff --git a/gr-digital/python/digital/qa_costas_loop_cc.py b/gr-digital/python/digital/qa_costas_loop_cc.py index 365eda736a..e920a76e05 100755 --- a/gr-digital/python/digital/qa_costas_loop_cc.py +++ b/gr-digital/python/digital/qa_costas_loop_cc.py @@ -20,10 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import psk -import random, cmath +import random +import cmath + +from gnuradio import gr, gr_unittest, digital +from gnuradio.digital import psk class test_costas_loop_cc(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_cpm.py b/gr-digital/python/digital/qa_cpm.py index 070e69a982..5f7253f5f8 100755 --- a/gr-digital/python/digital/qa_cpm.py +++ b/gr-digital/python/digital/qa_cpm.py @@ -20,12 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import analog_swig as analog -import blocks_swig as blocks import numpy +from gnuradio import gr, gr_unittest, digital, analog, blocks + class test_cpm(gr_unittest.TestCase): def setUp(self): diff --git a/gr-digital/python/digital/qa_crc32.py b/gr-digital/python/digital/qa_crc32.py index cd4006b1d3..9252825ad6 100755 --- a/gr-digital/python/digital/qa_crc32.py +++ b/gr-digital/python/digital/qa_crc32.py @@ -20,9 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import random, cmath +import random +import cmath + +from gnuradio import gr, gr_unittest, digital class test_crc32(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_diff_encoder.py b/gr-digital/python/digital/qa_diff_encoder.py index c28f4dbdf8..34249760c5 100755 --- a/gr-digital/python/digital/qa_diff_encoder.py +++ b/gr-digital/python/digital/qa_diff_encoder.py @@ -20,11 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital import math import random +from gnuradio import gr, gr_unittest, digital + def make_random_int_tuple(L, min, max): result = [] for x in range(L): diff --git a/gr-digital/python/digital/qa_diff_phasor_cc.py b/gr-digital/python/digital/qa_diff_phasor_cc.py index 833158d0a8..84e151a630 100755 --- a/gr-digital/python/digital/qa_diff_phasor_cc.py +++ b/gr-digital/python/digital/qa_diff_phasor_cc.py @@ -20,10 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital import math +from gnuradio import gr, gr_unittest, digital + class test_diff_phasor(gr_unittest.TestCase): def setUp(self): diff --git a/gr-digital/python/digital/qa_digital.py b/gr-digital/python/digital/qa_digital.py index 6f54f14208..63a167dece 100755 --- a/gr-digital/python/digital/qa_digital.py +++ b/gr-digital/python/digital/qa_digital.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_digital(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_fll_band_edge.py b/gr-digital/python/digital/qa_fll_band_edge.py index 0f6bad984e..02ded4e20c 100755 --- a/gr-digital/python/digital/qa_fll_band_edge.py +++ b/gr-digital/python/digital/qa_fll_band_edge.py @@ -20,12 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import filter_swig as filter -import blocks_swig as blocks -import analog_swig as analog -import random, math +import random +import math + +from gnuradio import gr, gr_unittest, digital, filter, blocks, analog class test_fll_band_edge_cc(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_framer_sink.py b/gr-digital/python/digital/qa_framer_sink.py index e717e6ae05..d5c4df1f1e 100755 --- a/gr-digital/python/digital/qa_framer_sink.py +++ b/gr-digital/python/digital/qa_framer_sink.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC' diff --git a/gr-digital/python/digital/qa_glfsr_source.py b/gr-digital/python/digital/qa_glfsr_source.py index c5adab3023..155a91c4a0 100755 --- a/gr-digital/python/digital/qa_glfsr_source.py +++ b/gr-digital/python/digital/qa_glfsr_source.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_glfsr_source(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_lfsr.py b/gr-digital/python/digital/qa_lfsr.py index d70c466ca7..8b8872ab3b 100755 --- a/gr-digital/python/digital/qa_lfsr.py +++ b/gr-digital/python/digital/qa_lfsr.py @@ -20,10 +20,9 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital import math +from gnuradio import gr, gr_unittest, digital class test_lfsr(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_lms_equalizer.py b/gr-digital/python/digital/qa_lms_equalizer.py index 9ba90a89ab..f610eeaaae 100755 --- a/gr-digital/python/digital/qa_lms_equalizer.py +++ b/gr-digital/python/digital/qa_lms_equalizer.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_lms_dd_equalizer(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_map.py b/gr-digital/python/digital/qa_map.py index 0fd7c479a1..df906d5e08 100755 --- a/gr-digital/python/digital/qa_map.py +++ b/gr-digital/python/digital/qa_map.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_map(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_mpsk_receiver.py b/gr-digital/python/digital/qa_mpsk_receiver.py index bde8895e76..d1ae81cef5 100755 --- a/gr-digital/python/digital/qa_mpsk_receiver.py +++ b/gr-digital/python/digital/qa_mpsk_receiver.py @@ -20,10 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import filter_swig as filter -import random, cmath, time +import random +import cmath +import time + +from gnuradio import gr, gr_unittest, digital, filter class test_mpsk_receiver(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_mpsk_snr_est.py b/gr-digital/python/digital/qa_mpsk_snr_est.py index c976bf21a8..7991f26a5b 100755 --- a/gr-digital/python/digital/qa_mpsk_snr_est.py +++ b/gr-digital/python/digital/qa_mpsk_snr_est.py @@ -19,10 +19,9 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # +import random -from gnuradio import gr, gr_unittest -import digital_swig as digital -import math, random +from gnuradio import gr, gr_unittest, digital def get_cplx(): return complex(2*random.randint(0,1) - 1, 0) diff --git a/gr-digital/python/digital/qa_ofdm_insert_preamble.py b/gr-digital/python/digital/qa_ofdm_insert_preamble.py index 60902edc14..a9664d6fe6 100755 --- a/gr-digital/python/digital/qa_ofdm_insert_preamble.py +++ b/gr-digital/python/digital/qa_ofdm_insert_preamble.py @@ -20,10 +20,9 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest from pprint import pprint -import digital_swig as digital -import blocks_swig as blocks + +from gnuradio import gr, gr_unittest, digital, blocks class test_ofdm_insert_preamble(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_pfb_clock_sync.py b/gr-digital/python/digital/qa_pfb_clock_sync.py index 4d0276bcd6..77a0c9eadf 100755 --- a/gr-digital/python/digital/qa_pfb_clock_sync.py +++ b/gr-digital/python/digital/qa_pfb_clock_sync.py @@ -20,10 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import filter_swig as filter -import digital_swig as digital -import random, cmath +import random +import cmath + +from gnuradio import gr, gr_unittest, filter, digital class test_pfb_clock_sync(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_pn_correlator_cc.py b/gr-digital/python/digital/qa_pn_correlator_cc.py index 53633d04fa..f637ee7bd3 100755 --- a/gr-digital/python/digital/qa_pn_correlator_cc.py +++ b/gr-digital/python/digital/qa_pn_correlator_cc.py @@ -20,9 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, digital, blocks class test_pn_correlator_cc(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_probe_density.py b/gr-digital/python/digital/qa_probe_density.py index f42f00a7f7..bcf4eeeaf0 100755 --- a/gr-digital/python/digital/qa_probe_density.py +++ b/gr-digital/python/digital/qa_probe_density.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_probe_density(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_scrambler.py b/gr-digital/python/digital/qa_scrambler.py index 3127a7c1e6..e11958c650 100755 --- a/gr-digital/python/digital/qa_scrambler.py +++ b/gr-digital/python/digital/qa_scrambler.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital +from gnuradio import gr, gr_unittest, digital class test_scrambler(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_simple_correlator.py b/gr-digital/python/digital/qa_simple_correlator.py index ff0faeb415..4af1d542c8 100755 --- a/gr-digital/python/digital/qa_simple_correlator.py +++ b/gr-digital/python/digital/qa_simple_correlator.py @@ -20,10 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks -import filter_swig as filter -import digital_swig as digital +from gnuradio import gr, gr_unittest, blocks, filter, digital class test_simple_correlator(gr_unittest.TestCase): diff --git a/gr-digital/python/digital/qa_simple_framer.py b/gr-digital/python/digital/qa_simple_framer.py index f8c894da28..095d61c5e5 100755 --- a/gr-digital/python/digital/qa_simple_framer.py +++ b/gr-digital/python/digital/qa_simple_framer.py @@ -20,9 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import digital_swig as digital -import math +from gnuradio import gr, gr_unittest, digital class test_simple_framer(gr_unittest.TestCase): |