diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2019-03-29 14:14:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-29 14:14:27 -0400 |
commit | abdfa1d970c9d965a1f05d0b26fa3b8d350bb265 (patch) | |
tree | 11114e7f40969e32a3dc659c438be7f4e744bb72 | |
parent | 91d2c60cd368a5c974caa8af39c4a8233409ade5 (diff) | |
download | sdl_core-abdfa1d970c9d965a1f05d0b26fa3b8d350bb265.tar.gz |
Fix build when ENABLE_LOG=OFF and BUILD_TESTS=ON (#2863)
* Change cmake flags to exclude some warnings from -Werror
* Fix build failures with ENABLE_LOG=OFF and BUILD_TESTS=ON
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/appMain/test/low_voltage_signals_handler_test.cc | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f6ee77a143..38bb95c9fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}) set(ARCHIVE_OUTPUT_DIRECTORY ./bin) -set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror -Wuninitialized -Wvla") +set(EXCLUDE_ERROR_FLAGS "-Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations") +set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla") if (USE_GOLD_LD) execute_process(COMMAND ld -v OUTPUT_VARIABLE result) diff --git a/src/appMain/test/low_voltage_signals_handler_test.cc b/src/appMain/test/low_voltage_signals_handler_test.cc index 14210df71d..2dea9447c6 100644 --- a/src/appMain/test/low_voltage_signals_handler_test.cc +++ b/src/appMain/test/low_voltage_signals_handler_test.cc @@ -36,7 +36,6 @@ #include "gtest/gtest.h" #include "appMain/test/mock_life_cycle.h" #include "utils/mock_signals_posix.h" -#include "config_profile/profile.h" #include "utils/macro.h" namespace test { @@ -45,6 +44,10 @@ using ::testing::_; using ::testing::Return; using ::testing::InSequence; +const int kLowVoltageSignalOffset = 1; +const int kWakeUpSignalOffset = 2; +const int kIgnitionOffSignalOffset = 3; + class LowVoltageSignalsHandlerTest : public ::testing::Test { protected: LowVoltageSignalsHandlerTest() @@ -52,10 +55,8 @@ class LowVoltageSignalsHandlerTest : public ::testing::Test { , mock_signals_posix_(*utils::MockSignalsPosix::signals_posix_mock()) {} void SetUp() OVERRIDE { - profile_.set_config_file_name("smartDeviceLink.ini"); - signals_offset_ = {profile_.low_voltage_signal_offset(), - profile_.wake_up_signal_offset(), - profile_.ignition_off_signal_offset()}; + signals_offset_ = { + kLowVoltageSignalOffset, kWakeUpSignalOffset, kIgnitionOffSignalOffset}; low_voltage_signals_handler_ = std::unique_ptr<main_namespace::LowVoltageSignalsHandler>( @@ -63,7 +64,6 @@ class LowVoltageSignalsHandlerTest : public ::testing::Test { *mock_life_cycle_.get(), signals_offset_)); } - profile::Profile profile_; main_namespace::LowVoltageSignalsOffset signals_offset_; std::unique_ptr<main_namespace::LowVoltageSignalsHandler> low_voltage_signals_handler_; |