diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-11 22:34:39 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-11 22:34:39 -0700 |
| commit | f36cc1b1a36b6fe19a8b6833698e121757c35221 (patch) | |
| tree | 53c4c5a505efb33cb97876880385b7757c38d9f5 /gr-trellis/python | |
| parent | c0bfa25772ebf0b3b6b943dcab6a3497d1330507 (diff) | |
trellis: Updating testing environment.
Diffstat (limited to 'gr-trellis/python')
| -rw-r--r-- | gr-trellis/python/trellis/CMakeLists.txt | 27 | ||||
| -rwxr-xr-x | gr-trellis/python/trellis/qa_trellis.py | 7 |
2 files changed, 11 insertions, 23 deletions
diff --git a/gr-trellis/python/trellis/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt index a166764fbe..b009c2684b 100644 --- a/gr-trellis/python/trellis/CMakeLists.txt +++ b/gr-trellis/python/trellis/CMakeLists.txt @@ -34,24 +34,17 @@ GR_PYTHON_INSTALL( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-trellis/python - ${CMAKE_BINARY_DIR}/gr-trellis/swig - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/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-digital/python - ${CMAKE_BINARY_DIR}/gr-digital/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-trellis gnuradio-digital gnuradio-analog gnuradio-filter) + 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-trellis/python/trellis/qa_trellis.py b/gr-trellis/python/trellis/qa_trellis.py index 983a749af6..fa591ae631 100755 --- a/gr-trellis/python/trellis/qa_trellis.py +++ b/gr-trellis/python/trellis/qa_trellis.py @@ -23,12 +23,7 @@ import math import os -from gnuradio import gr, gr_unittest - -import trellis_swig as trellis -import digital_swig as digital -import analog_swig as analog -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, trellis, digital, analog, blocks fsm_args = {"awgn1o2_4": (2, 4, 4, (0, 2, 0, 2, 1, 3, 1, 3), |