fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 22:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unit tests: Workaround for driver framework. Now unit tests are fully enabled

Browse Source
This commit is contained in:
Lorenz Meier
2015-12-06 12:19:24 +01:00
parent 292688b371
commit 314bb49bce
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/device/vdev.cpp
+2
View File
@@ -548,6 +548,7 @@ void VDev::showDevices()
pthread_mutex_unlock(&devmutex); pthread_mutex_unlock(&devmutex);
#ifndef __PX4_UNIT_TESTS
PX4_INFO("DF Devices:"); PX4_INFO("DF Devices:");
const char *dev_path; const char *dev_path;
unsigned int index = 0; unsigned int index = 0;
@@ -561,6 +562,7 @@ void VDev::showDevices()
PX4_INFO(" %s", dev_path); PX4_INFO(" %s", dev_path);
} }
} while (i == 0); } while (i == 0);
#endif
} }
void VDev::showTopics() void VDev::showTopics()
unittests/CMakeLists.txt
+2 -2
View File
@@ -26,9 +26,9 @@ include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11) 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__ -g -Wall") 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")
elseif(COMPILER_SUPPORTS_CXX0X) 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__ -g -Wall") 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")
else() else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
endif() endif()