diff options
-rw-r--r-- | cmake/Modules/GrTest.cmake | 18 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt | 7 | ||||
-rw-r--r-- | gnuradio-runtime/python/pmt/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-analog/python/analog/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-audio/python/audio/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-blocks/python/blocks/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-channels/python/channels/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-digital/python/digital/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-dtv/python/dtv/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-fec/python/fec/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-fft/python/fft/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-filter/python/filter/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/CMakeLists.txt | 5 | ||||
-rw-r--r-- | gr-trellis/python/trellis/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-uhd/python/uhd/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-utils/modtool/tests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-video-sdl/python/video_sdl/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-vocoder/python/vocoder/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-wavelet/python/wavelet/CMakeLists.txt | 3 | ||||
-rw-r--r-- | gr-zeromq/python/zeromq/CMakeLists.txt | 3 |
20 files changed, 72 insertions, 9 deletions
diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake index 7be65492ee..9d75ece646 100644 --- a/cmake/Modules/GrTest.cmake +++ b/cmake/Modules/GrTest.cmake @@ -98,11 +98,13 @@ function(GR_ADD_TEST test_name) endif(CMAKE_CROSSCOMPILING) set(sh_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.sh) file(WRITE ${sh_file} "#!${SHELL}\n") - #each line sets an environment variable - foreach(environ ${environs}) - file(APPEND ${sh_file} "export ${environ}\n") - endforeach(environ) - #load the command to run with its arguments + if (NOT CMAKE_CROSSCOMPILING) + #each line sets an environment variable + foreach(environ ${environs}) + file(APPEND ${sh_file} "export ${environ}\n") + endforeach(environ) + #load the command to run with its arguments + endif(CMAKE_CROSSCOMPILING) foreach(arg ${ARGN}) file(APPEND ${sh_file} "${arg} ") endforeach(arg) @@ -111,7 +113,7 @@ function(GR_ADD_TEST test_name) #make the shell file executable execute_process(COMMAND chmod +x ${sh_file}) - add_test(${test_name} ${SHELL} ${sh_file}) + add_test(${test_name} ${SHELL} ${test_name}_test.sh) endif(UNIX) if(WIN32) @@ -161,5 +163,7 @@ function(GR_ADD_CPP_TEST test_name test_source) set_target_properties(${test_name} PROPERTIES COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN" ) - GR_ADD_TEST(${test_name} ${test_name}) + IF (NOT CMAKE_CROSSCOMPILING) + GR_ADD_TEST(${test_name} ${test_name}) + ENDIF(CMAKE_CROSSCOMPILING) endfunction(GR_ADD_CPP_TEST) diff --git a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt index eccdcf7367..231d8762cd 100644 --- a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt @@ -51,7 +51,12 @@ if(ENABLE_TESTING) 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} ${QA_PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${py_qa_test_file}) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) + else() + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${py_qa_test_file}) + endif(CMAKE_CROSSCOMPILING) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gnuradio-runtime/python/pmt/CMakeLists.txt b/gnuradio-runtime/python/pmt/CMakeLists.txt index 3dcec8246b..679104cb6e 100644 --- a/gnuradio-runtime/python/pmt/CMakeLists.txt +++ b/gnuradio-runtime/python/pmt/CMakeLists.txt @@ -28,6 +28,9 @@ foreach(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gnuradio-runtime/python ) set(GR_TEST_TARGET_DEPS gnuradio-runtime) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-analog/python/analog/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt index d717f305f5..9e6c3a84b9 100644 --- a/gr-analog/python/analog/CMakeLists.txt +++ b/gr-analog/python/analog/CMakeLists.txt @@ -41,6 +41,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-audio/python/audio/CMakeLists.txt b/gr-audio/python/audio/CMakeLists.txt index cc195dd062..4a5f128288 100644 --- a/gr-audio/python/audio/CMakeLists.txt +++ b/gr-audio/python/audio/CMakeLists.txt @@ -29,6 +29,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt index 587c7c7ca2..66ee4014b6 100644 --- a/gr-blocks/python/blocks/CMakeLists.txt +++ b/gr-blocks/python/blocks/CMakeLists.txt @@ -53,6 +53,9 @@ if(ENABLE_TESTING) foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) diff --git a/gr-channels/python/channels/CMakeLists.txt b/gr-channels/python/channels/CMakeLists.txt index d05901b944..c9afd9cd24 100644 --- a/gr-channels/python/channels/CMakeLists.txt +++ b/gr-channels/python/channels/CMakeLists.txt @@ -38,6 +38,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-digital/python/digital/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt index 33038c7c6d..9e0d4c0c40 100644 --- a/gr-digital/python/digital/CMakeLists.txt +++ b/gr-digital/python/digital/CMakeLists.txt @@ -58,6 +58,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-dtv/python/dtv/CMakeLists.txt b/gr-dtv/python/dtv/CMakeLists.txt index 0bcd841b3e..c35d963c19 100644 --- a/gr-dtv/python/dtv/CMakeLists.txt +++ b/gr-dtv/python/dtv/CMakeLists.txt @@ -32,6 +32,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-fec/python/fec/CMakeLists.txt b/gr-fec/python/fec/CMakeLists.txt index 0f051979ed..caa1babdbe 100644 --- a/gr-fec/python/fec/CMakeLists.txt +++ b/gr-fec/python/fec/CMakeLists.txt @@ -54,6 +54,9 @@ endif(NOT GSL_FOUND) foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) diff --git a/gr-fft/python/fft/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt index 2bd0afb0e1..75c6710ff0 100644 --- a/gr-fft/python/fft/CMakeLists.txt +++ b/gr-fft/python/fft/CMakeLists.txt @@ -30,6 +30,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-filter/python/filter/CMakeLists.txt b/gr-filter/python/filter/CMakeLists.txt index 1fb908fe68..24f88e7bb3 100644 --- a/gr-filter/python/filter/CMakeLists.txt +++ b/gr-filter/python/filter/CMakeLists.txt @@ -34,6 +34,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index b7c4817e7d..064ddada5d 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -57,7 +57,10 @@ if(ENABLE_TESTING) 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} ${QA_DISPLAY_SERVER} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-trellis/python/trellis/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt index b4da796630..114d6c8e29 100644 --- a/gr-trellis/python/trellis/CMakeLists.txt +++ b/gr-trellis/python/trellis/CMakeLists.txt @@ -32,6 +32,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-uhd/python/uhd/CMakeLists.txt b/gr-uhd/python/uhd/CMakeLists.txt index 1412e02915..0e75b5d446 100644 --- a/gr-uhd/python/uhd/CMakeLists.txt +++ b/gr-uhd/python/uhd/CMakeLists.txt @@ -32,6 +32,9 @@ 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-utils/modtool/tests/CMakeLists.txt b/gr-utils/modtool/tests/CMakeLists.txt index d00d303113..049b8d5149 100644 --- a/gr-utils/modtool/tests/CMakeLists.txt +++ b/gr-utils/modtool/tests/CMakeLists.txt @@ -24,6 +24,9 @@ if(ENABLE_TESTING) foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) diff --git a/gr-video-sdl/python/video_sdl/CMakeLists.txt b/gr-video-sdl/python/video_sdl/CMakeLists.txt index 20aaba85fd..6c7d112ac7 100644 --- a/gr-video-sdl/python/video_sdl/CMakeLists.txt +++ b/gr-video-sdl/python/video_sdl/CMakeLists.txt @@ -31,6 +31,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt index dae780e74e..04d7bd1246 100644 --- a/gr-vocoder/python/vocoder/CMakeLists.txt +++ b/gr-vocoder/python/vocoder/CMakeLists.txt @@ -49,6 +49,9 @@ if(ENABLE_TESTING) endif() foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index a1fbf173b9..e1827138ab 100644 --- a/gr-wavelet/python/wavelet/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt @@ -29,6 +29,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-zeromq/python/zeromq/CMakeLists.txt b/gr-zeromq/python/zeromq/CMakeLists.txt index 87ea10f832..93fed52bee 100644 --- a/gr-zeromq/python/zeromq/CMakeLists.txt +++ b/gr-zeromq/python/zeromq/CMakeLists.txt @@ -39,6 +39,9 @@ if(ENABLE_TESTING) 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) + if (CMAKE_CROSSCOMPILING) + get_filename_component(py_qa_test_file ${py_qa_test_file} NAME) + endif(CMAKE_CROSSCOMPILING) GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) |