Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug fix/zero mac clang warning to errors (#9279)

This commit is contained in:
Wilfried Goesgens 2019-06-18 10:28:30 +02:00 committed by Frank Celler
parent 6fd3dd024c
commit 200be8ec8b
7 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/CMakeLists.txt
View File

@ -677,6 +677,11 @@ if(MSVC)
target_compile_options(arangod PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangoserver PRIVATE -Werror)
target_compile_options(arangod PRIVATE -Werror)
endif()
################################################################################
## arango-dfdb
################################################################################

34
arangosh/CMakeLists.txt
View File

@ -56,6 +56,10 @@ if(MSVC)
target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangobench PRIVATE -Werror)
endif()
################################################################################
## arangodump
################################################################################
@ -108,7 +112,11 @@ if (USE_JEMALLOC)
endif ()
if(MSVC)
target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangodump PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangodump PRIVATE -Werror)
endif()
################################################################################
@ -164,6 +172,10 @@ if(MSVC)
target_compile_options(arangoexport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangoexport PRIVATE -Werror)
endif()
################################################################################
## arangoimport
################################################################################
@ -228,6 +240,11 @@ install_command_alias(arangoimport
if(MSVC)
target_compile_options(arangoimport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangoimport PRIVATE -Werror)
endif()
################################################################################
## arangorestore
################################################################################
@ -282,6 +299,11 @@ endif ()
if(MSVC)
target_compile_options(arangorestore PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangorestore PRIVATE -Werror)
endif()
################################################################################
## arangosh
################################################################################
@ -343,6 +365,11 @@ endif ()
if(MSVC)
target_compile_options(arangosh PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangosh PRIVATE -Werror)
endif()
################################################################################
## arangovpack
################################################################################
@ -394,6 +421,11 @@ endif ()
if(MSVC)
target_compile_options(arangovpack PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(arangovpack PRIVATE -Werror)
endif()
################################################################################
## foxx-manager
################################################################################

6
lib/CMakeLists.txt
View File

@ -336,3 +336,9 @@ if(MSVC)
target_compile_options(${LIB_ARANGO_GEO} PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(${LIB_ARANGO} PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
target_compile_options(${LIB_ARANGO_V8} PRIVATE -Werror)
target_compile_options(${LIB_ARANGO_GEO} PRIVATE -Werror)
target_compile_options(${LIB_ARANGO} PRIVATE -Werror)
endif()

5
tests/CMakeLists.txt vendored
View File

@ -230,6 +230,11 @@ if(MSVC)
target_compile_options(arangodbtests PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
if (DARWIN)
# Missing Braces is broken in older CLangs - disable them here.
target_compile_options(arangodbtests PRIVATE -Werror -Wno-missing-braces)
endif()
# add these includes as system includes because otherwise
# the compiler will emit warnings for fakeit.hpp
target_include_directories(arangodbtests SYSTEM PRIVATE

4
tests/IResearch/AgencyCommManagerMock.h
View File

@ -25,6 +25,10 @@
#define ARANGODB_IRESEARCH__IRESEARCH_AGENCY_COMM_MANAGER_MOCK_H 1
#include <map>
#ifdef feof_unlocked
#undef feof_unlocked
#endif
#include "utils/file_utils.hpp"
#include "Agency/AgencyComm.h"

2
tests/IResearch/IResearchQueryTokens-test.cpp
View File

@ -142,8 +142,6 @@ REGISTER_ANALYZER_JSON(TestDelimAnalyzer, TestDelimAnalyzer::make);
// --SECTION-- setup / tear-down
// -----------------------------------------------------------------------------
extern const char* ARGV0; // defined in main.cpp
class IResearchQueryTokensTest : public ::testing::Test {
protected:
StorageEngineMock engine;

1
tests/IResearch/IResearchViewMeta-test.cpp
View File

@ -743,7 +743,6 @@ TEST_F(IResearchViewMetaTest, test_writeMaskAll) {
arangodb::iresearch::IResearchViewMeta::Mask mask(true);
arangodb::iresearch::IResearchViewMetaState::Mask maskState(true);
arangodb::velocypack::Builder builder;
arangodb::velocypack::Slice tmpSlice;
builder.openObject();
EXPECT_TRUE((true == meta.json(builder, nullptr, &mask)));