summaryrefslogtreecommitdiff
path: root/gr-noaa
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-03-11 22:43:29 -0700
committerBen Reynwar <ben@reynwar.net>2013-03-11 22:43:29 -0700
commit5cb2024dba37a5c212b558c1c15a3ad259569c6c (patch)
tree3c59f5e08b53efffa9637eaf80a43f575eb3fcef /gr-noaa
parentb60c04500e26f5f5b03f4498b68c980ffdc056f9 (diff)
noaa: Updating testing environment.
Diffstat (limited to 'gr-noaa')
-rw-r--r--gr-noaa/python/noaa/CMakeLists.txt20
-rwxr-xr-xgr-noaa/python/noaa/qa_noaa.py3
2 files changed, 11 insertions, 12 deletions
diff --git a/gr-noaa/python/noaa/CMakeLists.txt b/gr-noaa/python/noaa/CMakeLists.txt
index 306b8d981b..79c7b712cd 100644
--- a/gr-noaa/python/noaa/CMakeLists.txt
+++ b/gr-noaa/python/noaa/CMakeLists.txt
@@ -34,17 +34,17 @@ GR_PYTHON_INSTALL(
########################################################################
if(ENABLE_TESTING)
-list(APPEND GR_TEST_PYTHON_DIRS
- ${CMAKE_BINARY_DIR}/gr-noaa/python
- ${CMAKE_BINARY_DIR}/gr-noaa/swig
-)
-
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-noaa)
+ 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-noaa/python/noaa/qa_noaa.py b/gr-noaa/python/noaa/qa_noaa.py
index e55debd771..9b00f6a269 100755
--- a/gr-noaa/python/noaa/qa_noaa.py
+++ b/gr-noaa/python/noaa/qa_noaa.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-import noaa_swig as noaa
+from gnuradio import gr, gr_unittest, noaa
class test_noaa(gr_unittest.TestCase):