diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-03-11 23:03:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-03-11 23:03:33 -0700 |
| commit | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (patch) | |
| tree | 62894cf632b10427df826c53873685c622ffc2b7 | |
| parent | 8417ae426fb8eaab34574e4eb083590ab5690b14 (diff) | |
comedi: Updating testing environment.
| -rw-r--r-- | gr-comedi/python/comedi/CMakeLists.txt | 20 | ||||
| -rwxr-xr-x | gr-comedi/python/comedi/qa_comedi.py | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/gr-comedi/python/comedi/CMakeLists.txt b/gr-comedi/python/comedi/CMakeLists.txt index d8c9fa5d9f..0b62bd910b 100644 --- a/gr-comedi/python/comedi/CMakeLists.txt +++ b/gr-comedi/python/comedi/CMakeLists.txt @@ -34,17 +34,17 @@ GR_PYTHON_INSTALL( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-comedi/python - ${CMAKE_BINARY_DIR}/gr-comedi/swig -) - -list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi) + 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-comedi/python/comedi/qa_comedi.py b/gr-comedi/python/comedi/qa_comedi.py index 573a2193f7..08ec92dd13 100755 --- a/gr-comedi/python/comedi/qa_comedi.py +++ b/gr-comedi/python/comedi/qa_comedi.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import comedi_swig as comedi +from gnuradio import gr, gr_unittest, comedi class test_comedi(gr_unittest.TestCase): |