summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2012-11-04 09:14:20 -0800
committerJohnathan Corgan <johnathan@corganlabs.com>2012-11-04 09:14:20 -0800
commitd0694e70599197402e02a714cf4edb204aa8e296 (patch)
treef70e81a5ede9d7acfe631e0a25328841548b7f2d
parent419d266f61e1721c5222c4d23903728cec8b6ec7 (diff)
parentcc8620141d9c20e9dda84707db77a3ebf4d2ce5f (diff)
Merge branch 'master' into next
-rw-r--r--gr-blocks/python/CMakeLists.txt2
-rw-r--r--gr-comedi/src/CMakeLists.txt2
-rw-r--r--gr-fcd/python/CMakeLists.txt2
-rw-r--r--gr-fft/python/CMakeLists.txt2
-rw-r--r--gr-filter/python/CMakeLists.txt2
-rw-r--r--gr-pager/python/CMakeLists.txt2
-rw-r--r--gr-qtgui/python/CMakeLists.txt2
-rw-r--r--gr-trellis/src/python/CMakeLists.txt3
-rw-r--r--gr-video-sdl/src/CMakeLists.txt2
9 files changed, 10 insertions, 9 deletions
diff --git a/gr-blocks/python/CMakeLists.txt b/gr-blocks/python/CMakeLists.txt
index a7f0e741ad..5044e2320f 100644
--- a/gr-blocks/python/CMakeLists.txt
+++ b/gr-blocks/python/CMakeLists.txt
@@ -42,6 +42,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-blocks/swig
)
set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-blocks)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 5291e4d905..8c4834115b 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -110,6 +110,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-comedi/src
)
set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ 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)
diff --git a/gr-fcd/python/CMakeLists.txt b/gr-fcd/python/CMakeLists.txt
index 55233d256e..9e59e643f2 100644
--- a/gr-fcd/python/CMakeLists.txt
+++ b/gr-fcd/python/CMakeLists.txt
@@ -42,6 +42,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-fcd/swig
)
set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-audio gnuradio-fcd)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt
index 3cca444f9a..c994b1a6ae 100644
--- a/gr-fft/python/CMakeLists.txt
+++ b/gr-fft/python/CMakeLists.txt
@@ -43,6 +43,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-fft/swig
)
set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-fft)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-filter/python/CMakeLists.txt b/gr-filter/python/CMakeLists.txt
index 07f03fac4c..65664dad1c 100644
--- a/gr-filter/python/CMakeLists.txt
+++ b/gr-filter/python/CMakeLists.txt
@@ -45,6 +45,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-filter/swig
)
set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-filter)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/CMakeLists.txt
index c0e1b1be13..7afe81b03d 100644
--- a/gr-pager/python/CMakeLists.txt
+++ b/gr-pager/python/CMakeLists.txt
@@ -44,6 +44,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-pager/swig
)
set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-pager)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt
index e3fd602ef2..e57338073c 100644
--- a/gr-qtgui/python/CMakeLists.txt
+++ b/gr-qtgui/python/CMakeLists.txt
@@ -41,6 +41,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-qtgui/swig
)
set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-qtgui)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index ae2ab9cb41..d75a242c82 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -21,6 +21,7 @@
# Handle the unit tests
########################################################################
if(ENABLE_TESTING)
+include(GrPython)
include(GrTest)
file(GLOB py_qa_test_files "qa_*.py")
foreach(py_qa_test_file ${py_qa_test_files})
@@ -32,6 +33,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-trellis/src/lib
)
set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital gnuradio-trellis)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index a5c5b8cbd2..0a8c83168c 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -109,6 +109,6 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-video-sdl/src
)
set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-video-sdl)
- GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ 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)