mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-30 23:03:05 +00:00 
			
		
		
		
	Fix dh_auto_test execution, fixes #47
This commit is contained in:
		| @@ -437,115 +437,98 @@ endif(ENABLE_SYSTEM_TESTING) | |||||||
| set(CMAKE_CTEST_COMMAND ctest -V) | set(CMAKE_CTEST_COMMAND ctest -V) | ||||||
| add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) | add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) | ||||||
|  |  | ||||||
| add_executable(control_thread_test |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc |  | ||||||
| ) |  | ||||||
| if(NOT ${ENABLE_PACKAGING}) | if(NOT ${ENABLE_PACKAGING}) | ||||||
|  |      add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|  |                                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc | ||||||
|  |                                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc | ||||||
|  |                    ) | ||||||
|  |      target_link_libraries(control_thread_test ${Boost_LIBRARIES} | ||||||
|  |                                                ${GFlags_LIBS} | ||||||
|  |                                                ${GLOG_LIBRARIES} | ||||||
|  |                                                ${GTEST_LIBRARIES} | ||||||
|  |                                                gnss_sp_libs | ||||||
|  |                                                gnss_system_parameters | ||||||
|  |                                                gnss_rx | ||||||
|  |                                                ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |                           ) | ||||||
|  |      add_test(control_thread_test control_thread_test) | ||||||
|  |      if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |           add_dependencies(control_thread_test gtest-${gtest_RELEASE}) | ||||||
|  |      else(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |           add_dependencies(control_thread_test gtest) | ||||||
|  |      endif(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |      set_property(TEST control_thread_test PROPERTY TIMEOUT 30) | ||||||
|      set_property(TARGET control_thread_test PROPERTY EXCLUDE_FROM_ALL TRUE) |      set_property(TARGET control_thread_test PROPERTY EXCLUDE_FROM_ALL TRUE) | ||||||
| endif(NOT ${ENABLE_PACKAGING}) |       | ||||||
|  |      ######################################################### | ||||||
| target_link_libraries(control_thread_test ${Boost_LIBRARIES} |       | ||||||
|  |      add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|  |                                    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc ) | ||||||
|  |      set_property(TARGET flowgraph_test PROPERTY EXCLUDE_FROM_ALL TRUE) | ||||||
|  |      target_link_libraries(flowgraph_test ${Boost_LIBRARIES} | ||||||
|                                           ${GFlags_LIBS} |                                           ${GFlags_LIBS} | ||||||
|                                           ${GLOG_LIBRARIES} |                                           ${GLOG_LIBRARIES} | ||||||
|                                           ${GTEST_LIBRARIES} |                                           ${GTEST_LIBRARIES} | ||||||
|                                           gnss_sp_libs |                                           gnss_sp_libs | ||||||
|                                           gnss_system_parameters |  | ||||||
|                                           gnss_rx |                                           gnss_rx | ||||||
|                                           ${VOLK_GNSSSDR_LIBRARIES} |                                           gnss_system_parameters | ||||||
|                                           ) |                                           ${VOLK_GNSSSDR_LIBRARIES} ) | ||||||
|  |      add_test(flowgraph_test flowgraph_test) | ||||||
| add_test(control_thread_test control_thread_test) |      if(NOT ${GTEST_DIR_LOCAL}) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) |           add_dependencies(flowgraph_test gtest-${gtest_RELEASE}) | ||||||
|     add_dependencies(control_thread_test gtest-${gtest_RELEASE}) |      else(NOT ${GTEST_DIR_LOCAL}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) |           add_dependencies(flowgraph_test gtest) | ||||||
|     add_dependencies(control_thread_test gtest) |      endif(NOT ${GTEST_DIR_LOCAL}) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) |      set_property(TEST flowgraph_test PROPERTY TIMEOUT 30) | ||||||
| set_property(TEST control_thread_test PROPERTY TIMEOUT 30) |  | ||||||
|  |  | ||||||
| add_executable(flowgraph_test |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc |  | ||||||
| ) |  | ||||||
| if(NOT ${ENABLE_PACKAGING}) |  | ||||||
|      set_property(TARGET flowgraph_test PROPERTY EXCLUDE_FROM_ALL TRUE) |      set_property(TARGET flowgraph_test PROPERTY EXCLUDE_FROM_ALL TRUE) | ||||||
| endif(NOT ${ENABLE_PACKAGING}) |       | ||||||
|  |      ######################################################### | ||||||
| target_link_libraries(flowgraph_test ${Boost_LIBRARIES} |       | ||||||
|                                      ${GFlags_LIBS} |      add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|                                      ${GLOG_LIBRARIES} |                                     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc | ||||||
|                                      ${GTEST_LIBRARIES} |                                     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc | ||||||
|                                      gnss_sp_libs |                                     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc | ||||||
|                                      gnss_rx |                                     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc | ||||||
|                                      gnss_system_parameters |                    ) | ||||||
|                                      ${VOLK_GNSSSDR_LIBRARIES} |  | ||||||
|                                      ) |  | ||||||
|  |  | ||||||
| add_test(flowgraph_test flowgraph_test) |  | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
|     add_dependencies(flowgraph_test gtest-${gtest_RELEASE}) |  | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
|     add_dependencies(flowgraph_test gtest) |  | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
| set_property(TEST flowgraph_test PROPERTY TIMEOUT 30) |  | ||||||
|  |  | ||||||
| add_executable(gnss_block_test |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc |  | ||||||
| ) |  | ||||||
| if(NOT ${ENABLE_PACKAGING}) |  | ||||||
|      set_property(TARGET gnss_block_test PROPERTY EXCLUDE_FROM_ALL TRUE) |      set_property(TARGET gnss_block_test PROPERTY EXCLUDE_FROM_ALL TRUE) | ||||||
|  |      target_link_libraries(gnss_block_test ${Boost_LIBRARIES} | ||||||
|  |                                            ${GFlags_LIBS} | ||||||
|  |                                            ${GLOG_LIBRARIES} | ||||||
|  |                                            ${GTEST_LIBRARIES} | ||||||
|  |                                            ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |                                            ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|  |                                            ${GNURADIO_FILTER_LIBRARIES} | ||||||
|  |                                            ${GNURADIO_ANALOG_LIBRARIES} | ||||||
|  |                                            gnss_sp_libs | ||||||
|  |                                            gnss_rx | ||||||
|  |                                            gnss_system_parameters | ||||||
|  |                                            ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |                           ) | ||||||
|  |      add_test(gnss_block_test gnss_block_test) | ||||||
|  |      if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |           add_dependencies(gnss_block_test gtest-${gtest_RELEASE}) | ||||||
|  |      else(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |           add_dependencies(gnss_block_test gtest) | ||||||
|  |      endif(NOT ${GTEST_DIR_LOCAL}) | ||||||
| endif(NOT ${ENABLE_PACKAGING}) | endif(NOT ${ENABLE_PACKAGING}) | ||||||
|  |  | ||||||
| target_link_libraries(gnss_block_test ${Boost_LIBRARIES} |  | ||||||
|                                       ${GFlags_LIBS} |  | ||||||
|                                       ${GLOG_LIBRARIES} |  | ||||||
|                                       ${GTEST_LIBRARIES} |  | ||||||
|                                       ${GNURADIO_RUNTIME_LIBRARIES} |  | ||||||
|                                       ${GNURADIO_BLOCKS_LIBRARIES} |  | ||||||
|                                       ${GNURADIO_FILTER_LIBRARIES} |  | ||||||
|                                       ${GNURADIO_ANALOG_LIBRARIES} |  | ||||||
|                                       gnss_sp_libs |  | ||||||
|                                       gnss_rx |  | ||||||
|                                       gnss_system_parameters |  | ||||||
|                                       # signal_generator_blocks |  | ||||||
|                                       ${VOLK_GNSSSDR_LIBRARIES} |  | ||||||
|                                       ) |  | ||||||
|  |  | ||||||
| add_test(gnss_block_test gnss_block_test) |  | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
|     add_dependencies(gnss_block_test gtest-${gtest_RELEASE}) |  | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
|     add_dependencies(gnss_block_test gtest) |  | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) |  | ||||||
|  |  | ||||||
| add_executable(gnuradio_block_test |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |  | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc |  | ||||||
| ) |  | ||||||
| if(NOT ${ENABLE_PACKAGING}) |  | ||||||
|      set_property(TARGET gnuradio_block_test PROPERTY EXCLUDE_FROM_ALL TRUE) |  | ||||||
| endif(NOT ${ENABLE_PACKAGING}) |  | ||||||
|  |  | ||||||
|  | add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|  |                                    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc | ||||||
|  |               ) | ||||||
| target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES} | target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES} | ||||||
|                                       ${GFlags_LIBS} |                                           ${GFlags_LIBS} | ||||||
|                                       ${GLOG_LIBRARIES} |                                           ${GLOG_LIBRARIES} | ||||||
|                                       ${GTEST_LIBRARIES} |                                           ${GTEST_LIBRARIES} | ||||||
|                                       ${GNURADIO_RUNTIME_LIBRARIES} |                                           ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|                                       ${GNURADIO_BLOCKS_LIBRARIES} |                                           ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                                       ${GNURADIO_FILTER_LIBRARIES} |                                           ${GNURADIO_FILTER_LIBRARIES} | ||||||
|                                       ${GNURADIO_ANALOG_LIBRARIES} |                                           ${GNURADIO_ANALOG_LIBRARIES} | ||||||
|                                       gnss_sp_libs |                                           gnss_sp_libs | ||||||
|                                       gnss_rx |                                           gnss_rx | ||||||
|                                       gnss_system_parameters |                                           gnss_system_parameters | ||||||
|                                       # signal_generator_blocks |                                           ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|                                       ${VOLK_GNSSSDR_LIBRARIES} |                      ) | ||||||
|                                       ) |  | ||||||
|  |  | ||||||
| add_test(gnuradio_block_test gnuradio_block_test) | add_test(gnuradio_block_test gnuradio_block_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(gnuradio_block_test gtest-${gtest_RELEASE}) |     add_dependencies(gnuradio_block_test gtest-${gtest_RELEASE}) | ||||||
| @@ -574,16 +557,10 @@ endif(NOT ${GTEST_DIR_LOCAL}) | |||||||
| #                                ) | #                                ) | ||||||
| # add_test(acq_test acq_test) | # add_test(acq_test acq_test) | ||||||
|  |  | ||||||
| add_executable(trk_test | add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|                ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc | ||||||
|                ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc |                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc | ||||||
|                ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc |               ) | ||||||
|                ) |  | ||||||
|  |  | ||||||
| if(NOT ${ENABLE_PACKAGING}) |  | ||||||
|     set_property(TARGET trk_test PROPERTY EXCLUDE_FROM_ALL TRUE) |  | ||||||
| endif(NOT ${ENABLE_PACKAGING}) |  | ||||||
|  |  | ||||||
| target_link_libraries(trk_test ${Boost_LIBRARIES} | target_link_libraries(trk_test ${Boost_LIBRARIES} | ||||||
|                                ${GFlags_LIBS} |                                ${GFlags_LIBS} | ||||||
|                                ${GLOG_LIBRARIES} |                                ${GLOG_LIBRARIES} | ||||||
| @@ -597,7 +574,7 @@ target_link_libraries(trk_test ${Boost_LIBRARIES} | |||||||
|                                gnss_system_parameters |                                gnss_system_parameters | ||||||
|                                signal_generator_blocks |                                signal_generator_blocks | ||||||
|                                ${VOLK_GNSSSDR_LIBRARIES} |                                ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|                                ) |                      ) | ||||||
| add_test(trk_test trk_test) | add_test(trk_test trk_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(trk_test gtest-${gtest_RELEASE}) |     add_dependencies(trk_test gtest-${gtest_RELEASE}) | ||||||
| @@ -605,5 +582,10 @@ else(NOT ${GTEST_DIR_LOCAL}) | |||||||
|     add_dependencies(trk_test gtest) |     add_dependencies(trk_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif(NOT ${GTEST_DIR_LOCAL}) | ||||||
|  |  | ||||||
| add_dependencies(check control_thread_test flowgraph_test gnss_block_test |  | ||||||
|                  gnuradio_block_test trk_test) | if(${ENABLE_PACKAGING}) | ||||||
|  |      add_dependencies(check gnuradio_block_test trk_test) | ||||||
|  | else(${ENABLE_PACKAGING}) | ||||||
|  |      add_dependencies(check control_thread_test flowgraph_test gnss_block_test | ||||||
|  |                       gnuradio_block_test trk_test) | ||||||
|  | endif(${ENABLE_PACKAGING}) | ||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez