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-fcd/python/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-fcd/python/CMakeLists.txt')

diff --git a/gr-fcd/python/CMakeLists.txt b/gr-fcd/python/CMakeLists.txt
index 9e59e643f..0ecb2ac5a 100644
--- a/gr-fcd/python/CMakeLists.txt
+++ b/gr-fcd/python/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-fcd/python
         ${CMAKE_BINARY_DIR}/gr-fcd/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-audio gnuradio-fcd)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-audio gnuradio-fcd)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
-- 
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-fcd/python/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gr-fcd/python/CMakeLists.txt')

diff --git a/gr-fcd/python/CMakeLists.txt b/gr-fcd/python/CMakeLists.txt
index 0ecb2ac5a..39ec5efe9 100644
--- a/gr-fcd/python/CMakeLists.txt
+++ b/gr-fcd/python/CMakeLists.txt
@@ -31,17 +31,17 @@ GR_PYTHON_INSTALL(
 # Handle the unit tests
 ########################################################################
 if(ENABLE_TESTING)
+
+list(APPEND GR_TEST_PYTHON_DIRS
+    ${CMAKE_BINARY_DIR}/gr-fcd/python
+    ${CMAKE_BINARY_DIR}/gr-fcd/swig
+)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-audio gnuradio-fcd)
+
 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-fcd/python
-        ${CMAKE_BINARY_DIR}/gr-fcd/swig
-    )
-    list(APPEND GR_TEST_TARGET_DEPS gnuradio-audio gnuradio-fcd)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
-- 
cgit