diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-10 21:53:01 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-10 21:53:01 -0700 |
| commit | 46df1d2004ff22be42379f1dd5ad716efc70179f (patch) | |
| tree | f773e7b8c168647a5537268883f633f301320bed /gr-fft | |
| parent | 67db25ed372477aa0685a040d18faca2ca57f4dc (diff) | |
fft: Updating testing environment.
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/python/fft/CMakeLists.txt | 23 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_fft.py | 5 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_goertzel.py | 4 |
3 files changed, 14 insertions, 18 deletions
diff --git a/gr-fft/python/fft/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt index 415d87e2e8..2ffa3ee3c3 100644 --- a/gr-fft/python/fft/CMakeLists.txt +++ b/gr-fft/python/fft/CMakeLists.txt @@ -33,19 +33,16 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) - -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-fft/python - ${CMAKE_BINARY_DIR}/gr-fft/swig - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-fft) - -include(GrTest) -file(GLOB py_qa_test_files "qa_*.py") -foreach(py_qa_test_file ${py_qa_test_files}) + 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}) 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-fft/python/fft/qa_fft.py b/gr-fft/python/fft/qa_fft.py index 0a66a2c1fc..8a989505b6 100755 --- a/gr-fft/python/fft/qa_fft.py +++ b/gr-fft/python/fft/qa_fft.py @@ -19,12 +19,11 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from gnuradio import gr, gr_unittest -import fft_swig as fft -import blocks_swig as blocks import sys import random +from gnuradio import gr, gr_unittest, fft, blocks + primes = (2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53, 59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131, 137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223, diff --git a/gr-fft/python/fft/qa_goertzel.py b/gr-fft/python/fft/qa_goertzel.py index 27f9d370e1..0eb919f5a3 100755 --- a/gr-fft/python/fft/qa_goertzel.py +++ b/gr-fft/python/fft/qa_goertzel.py @@ -20,9 +20,9 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest from math import pi, cos -import fft_swig as fft + +from gnuradio import gr, gr_unittest, fft class test_goertzel(gr_unittest.TestCase): |