From 36299c59b4b4775f9688a4b8b8315dcc3f5c543d Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sun, 17 Jul 2016 15:24:15 +0100 Subject: [PATCH] unittests: whitespace --- unittests/CMakeLists.txt | 131 +++++++++++++++++++++++++++------------ 1 file changed, 93 insertions(+), 38 deletions(-) diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 9df3adcce3..53f3922dad 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +include(CMakeForceCompiler) +#CMAKE_FORCE_C_COMPILER(clang Clang) +#CMAKE_FORCE_CXX_COMPILER(clang++ Clang) + if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") add_compile_options(-Qunused-arguments ) endif() @@ -10,16 +14,28 @@ endif() project(unittests) enable_testing() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -std=gnu99 -g") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11 -g -fno-exceptions -fno-rtti -fno-threadsafe-statics") +include(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) +if(COMPILER_SUPPORTS_CXX11) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions -fno-rtti -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -D__PX4_UNIT_TESTS -g -Wall -Werror") +elseif(COMPILER_SUPPORTS_CXX0X) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-exceptions -fno-rtti -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -D__PX4_UNIT_TESTS -g -Wall -Werror") +else() + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") +endif() +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -fsanitize=address -fno-omit-frame-pointer") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-unused-but-set-variable") set(GTEST_DIR ${CMAKE_SOURCE_DIR}/googletest) add_subdirectory(${GTEST_DIR}) include_directories(${GTEST_DIR}/include) set(PX4_SRC ${CMAKE_SOURCE_DIR}/../src) -set(PX4_SITL_BUILD ${PX4_SRC}/../build_posix_sitl_default) +set(PX4_SITL_BUILD ${PX4_SRC}/../build_posix_sitl_test) include_directories(${CMAKE_SOURCE_DIR}) include_directories(${PX4_SITL_BUILD}/src) @@ -36,32 +52,43 @@ include_directories(${PX4_SRC}/modules/uORB) include_directories(${PX4_SRC}/platforms) include_directories(${PX4_SRC}/platforms/posix/include) include_directories(${PX4_SRC}/platforms/posix/px4_layer) -include_directories(${PX4_SRC}/platforms/posix/work_queue) -add_definitions(-D__CUSTOM_FILE_IO__) add_definitions(-D__EXPORT=) add_definitions(-D__PX4_POSIX) add_definitions(-D__PX4_TESTS) -add_definitions(-D__PX4_UNIT_TESTS) add_definitions(-D_UNIT_TEST=) add_definitions(-DERROR=-1) add_definitions(-Dmain_t=int) add_definitions(-Dnoreturn_function=) add_definitions(-DOK=0) -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - add_definitions(-D__PX4_DARWIN) -else() - add_definitions(-D__PX4_LINUX) -endif() +# check +add_custom_target(check + COMMAND ${CMAKE_CTEST_COMMAND} -j2 --output-on-failure + WORKING_DIR ${CMAKE_BINARY_DIR} + USES_TERMINAL) -add_library(px4_platform +function(add_gtest) + foreach(test_name ${ARGN}) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + target_link_libraries(${test_name} gtest_main pthread px4_platform) + add_definitions(-D__PX4_DARWIN) + else() + target_link_libraries(${test_name} gtest_main pthread rt px4_platform) + add_definitions(-D__PX4_LINUX) + endif() + add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + add_dependencies(check ${test_name}) + endforeach() +endfunction() + +add_library(px4_platform ${PX4_SITL_BUILD}/src/modules/param/px4_parameters.c - ${PX4_SRC}/drivers/device/device_posix.cpp - ${PX4_SRC}/drivers/device/i2c_posix.cpp + ${PX4_SRC}/drivers/device/device_posix.cpp + ${PX4_SRC}/drivers/device/i2c_posix.cpp ${PX4_SRC}/drivers/device/ringbuffer.cpp - ${PX4_SRC}/drivers/device/sim.cpp - ${PX4_SRC}/drivers/device/vdev.cpp + ${PX4_SRC}/drivers/device/sim.cpp + ${PX4_SRC}/drivers/device/vdev.cpp ${PX4_SRC}/drivers/device/vdev_posix.cpp ${PX4_SRC}/drivers/device/vfile.cpp ${PX4_SRC}/platforms/posix/px4_layer/drv_hrt.c @@ -87,28 +114,6 @@ add_library(px4_platform ${PX4_SRC}/platforms/posix/work_queue/work_thread.c ) target_include_directories(px4_platform PUBLIC ${PX4_SRC}/platforms) -target_include_directories(px4_platform PUBLIC ${PX4_SRC}/platforms/posix/include) -target_include_directories(px4_platform PUBLIC ${PX4_SRC}/platforms/posix/work_queue) - - -# check -add_custom_target(check - COMMAND ${CMAKE_CTEST_COMMAND} -j2 --output-on-failure - WORKING_DIR ${CMAKE_BINARY_DIR} - USES_TERMINAL) - -# add_gtest -function(add_gtest) - foreach(test_name ${ARGN}) - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - target_link_libraries(${test_name} gtest_main pthread px4_platform) - else() - target_link_libraries(${test_name} gtest_main pthread rt px4_platform) - endif() - add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - add_dependencies(check ${test_name}) - endforeach() -endfunction() ####################################################################### @@ -117,9 +122,59 @@ endfunction() # add_executable(example_test example_test.cpp) # add_gtest(example_test) + +# autodeclination_test +add_executable(autodeclination_test autodeclination_test.cpp ${PX4_SRC}/lib/geo_lookup/geo_mag_declination.c) +add_gtest(autodeclination_test) + +# mixer_test +add_custom_command(OUTPUT ${PX4_SRC}/modules/systemlib/mixer/mixer_multirotor.generated.h + COMMAND ${PX4_SRC}/modules/systemlib/mixer/multi_tables.py > ${PX4_SRC}/modules/systemlib/mixer/mixer_multirotor.generated.h) +add_executable(mixer_test mixer_test.cpp + ${PX4_SRC}/modules/systemlib/mixer/mixer.cpp + ${PX4_SRC}/modules/systemlib/mixer/mixer_group.cpp + ${PX4_SRC}/modules/systemlib/mixer/mixer_load.c + ${PX4_SRC}/modules/systemlib/mixer/mixer_multirotor.cpp + ${PX4_SRC}/modules/systemlib/mixer/mixer_multirotor.generated.h + ${PX4_SRC}/modules/systemlib/mixer/mixer_simple.cpp + ${PX4_SRC}/modules/systemlib/pwm_limit/pwm_limit.c + ${PX4_SRC}/systemcmds/tests/test_mixer.cpp) +add_gtest(mixer_test) + +# conversion_test +add_executable(conversion_test conversion_test.cpp ${PX4_SRC}/systemcmds/tests/test_conv.cpp) +add_gtest(conversion_test) + +# sbus2_test +add_executable(sbus2_test sbus2_test.cpp + ${PX4_SRC}/lib/rc/sbus.c) +add_gtest(sbus2_test) + +# DSM test +add_executable(dsm_test dsm_test.cpp + ${PX4_SRC}/lib/rc/dsm.c) +add_gtest(dsm_test) + +# st24_test +add_executable(rc_input_test st24_test.cpp sumd_test.cpp + ${PX4_SRC}/lib/rc/st24.c + ${PX4_SRC}/lib/rc/sumd.c) +add_gtest(rc_input_test) + +# sf0x_test +add_executable(sf0x_test sf0x_test.cpp + ${PX4_SRC}/drivers/sf0x/sf0x_parser.cpp) +add_gtest(sf0x_test) + # param_test add_executable(param_test param_test.cpp uorb_stub.cpp ${PX4_SRC}/modules/systemlib/bson/tinybson.c ${PX4_SRC}/modules/systemlib/param/param.c) target_link_libraries(param_test ${PX4_SITL_BUILD}/libmsg_gen.a) add_gtest(param_test) + +# param_shmem_test +#add_executable(param_shmem_test param_test.cpp uorb_stub.cpp +# ${PX4_SRC}/modules/systemlib/bson/tinybson.c +# ${PX4_SRC}/modules/systemlib/param/param_shmem.c) +#add_gtest(param_shmem_test)