summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-03-11 23:00:05 -0700
committerBen Reynwar <ben@reynwar.net>2013-03-11 23:00:05 -0700
commit299fe976bb597c8ad09a4dbfe494db4574f7175b (patch)
treea5a467bd1564b81e58ac7a276308c038d889ef6f
parent190ce4407bb1d861c85921a0298b4c21de0475a7 (diff)
video-sdl: Updating testing environment.
-rw-r--r--gr-video-sdl/python/video_sdl/CMakeLists.txt19
-rwxr-xr-xgr-video-sdl/python/video_sdl/qa_video_sdl.py3
2 files changed, 11 insertions, 11 deletions
diff --git a/gr-video-sdl/python/video_sdl/CMakeLists.txt b/gr-video-sdl/python/video_sdl/CMakeLists.txt
index 5ad70c4c25..ddfe54838d 100644
--- a/gr-video-sdl/python/video_sdl/CMakeLists.txt
+++ b/gr-video-sdl/python/video_sdl/CMakeLists.txt
@@ -34,16 +34,17 @@ GR_PYTHON_INSTALL(
########################################################################
if(ENABLE_TESTING)
-list(APPEND GR_TEST_PYTHON_DIRS
- ${CMAKE_BINARY_DIR}/gr-video-sdl/python
- ${CMAKE_BINARY_DIR}/gr-video-sdl/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
+ 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-video-sdl/python/video_sdl/qa_video_sdl.py b/gr-video-sdl/python/video_sdl/qa_video_sdl.py
index 68c3185ef5..f94957ccc4 100755
--- a/gr-video-sdl/python/video_sdl/qa_video_sdl.py
+++ b/gr-video-sdl/python/video_sdl/qa_video_sdl.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-import video_sdl_swig as video_sdl
+from gnuradio import gr, gr_unittest, video_sdl
class test_video_sdl (gr_unittest.TestCase):