From 37f752257d7fc336de1fe85a5a83134e66441e6e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:04:16 -0800
Subject: gr: set a common GR_TEST_TARGET_DEPS for all module unit tests
Each unit test shares common dependencies,
but we have been neglecting to set these.
In this changeset, we set one top level GR_TEST_TARGET_DEPS,
and simply append module-specific dependencies for each test.
This also helps to fix QA tests on windows
which were missing the dependencies list.
Conflicts:
gr-analog/python/CMakeLists.txt
gr-blocks/python/CMakeLists.txt
---
gr-video-sdl/src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-video-sdl/src')
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index 0a8c83168..65df9ef9e 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -108,7 +108,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
${CMAKE_BINARY_DIR}/gr-video-sdl/src
)
- set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-video-sdl)
+ list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING AND ENABLE_PYTHON)
--
cgit
From c4c0ce97f4f5586548a603acc8c9721f416c5803 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:31:45 -0800
Subject: gr: same change for common PYTHON test paths
Conflicts:
gr-analog/python/CMakeLists.txt
gr-blocks/python/CMakeLists.txt
---
gr-video-sdl/src/CMakeLists.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'gr-video-sdl/src')
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index 65df9ef9e..14fdb3802 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -99,16 +99,16 @@ endif(ENABLE_PYTHON)
# Handle the unit tests
########################################################################
if(ENABLE_TESTING AND ENABLE_PYTHON)
+
+list(APPEND GR_TEST_PYTHON_DIRS
+ ${CMAKE_BINARY_DIR}/gr-video-sdl/src
+)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
+
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)
- set(GR_TEST_PYTHON_DIRS
- ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
- ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
- ${CMAKE_BINARY_DIR}/gr-video-sdl/src
- )
- list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING AND ENABLE_PYTHON)
--
cgit