diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-11 22:37:26 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-11 22:37:26 -0700 |
| commit | 6b75f61307c5a7c8258461fe07ec366eb2afade3 (patch) | |
| tree | 4f80a659f0ccc5551d0c6655aca77da1d285e34e /gr-wavelet/python | |
| parent | f36cc1b1a36b6fe19a8b6833698e121757c35221 (diff) | |
wavelet: Updating testing environment.
Diffstat (limited to 'gr-wavelet/python')
| -rw-r--r-- | gr-wavelet/python/wavelet/CMakeLists.txt | 23 | ||||
| -rwxr-xr-x | gr-wavelet/python/wavelet/qa_classify.py | 11 |
2 files changed, 14 insertions, 20 deletions
diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index 7f7fd99ecf..ae9d3dc794 100644 --- a/gr-wavelet/python/wavelet/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt @@ -32,20 +32,17 @@ GR_PYTHON_INSTALL( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-analog/python - ${CMAKE_BINARY_DIR}/gr-analog/swig - ${CMAKE_BINARY_DIR}/gr-wavelet/python - ${CMAKE_BINARY_DIR}/gr-wavelet/swig - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-wavelet) + 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-wavelet/python/wavelet/qa_classify.py b/gr-wavelet/python/wavelet/qa_classify.py index c2972c92f2..efb8cb3d4c 100755 --- a/gr-wavelet/python/wavelet/qa_classify.py +++ b/gr-wavelet/python/wavelet/qa_classify.py @@ -21,13 +21,10 @@ # import numpy -from gnuradio import gr, gr_unittest +from gnuradio import gr, gr_unittest, wavelet, analog, blocks import copy #import pygsl.wavelet as wavelet # FIXME: pygsl not checked for in config import math -import wavelet_swig -import analog_swig as analog -import blocks_swig as blocks def sqr(x): return x*x @@ -108,7 +105,7 @@ class test_classify(gr_unittest.TestCase): src_data = (0.0, 1.0, 0.0, 1.0, 0.0) src = gr.vector_source_f(src_data, False, len(src_grid)) - sq = wavelet_swig.squash_ff(src_grid, trg_grid) + sq = wavelet.squash_ff(src_grid, trg_grid) dst = gr.vector_sink_f(len(trg_grid)) self.tb.connect(src, sq) self.tb.connect(sq, dst) @@ -134,7 +131,7 @@ class test_classify(gr_unittest.TestCase): # d = w.transform_inverse(c, ws) # # src = gr.vector_source_f(b, False, n) -# wv = wavelet_swig.wavelet_ff(n, o, True) +# wv = wavelet.wavelet_ff(n, o, True) # # dst = gr.vector_sink_f(n) # self.tb.connect(src, wv) @@ -163,7 +160,7 @@ class test_classify(gr_unittest.TestCase): k += 01<<e src = gr.vector_source_f(src_data, False, len(src_data)) - kon = wavelet_swig.wvps_ff(len(src_data)) + kon = wavelet.wvps_ff(len(src_data)) dst = gr.vector_sink_f(int(math.ceil(math.log(len(src_data), 2)))) self.tb.connect(src, kon) |