10000 Bug fix/tests cleanup by jsteemann · Pull Request #11028 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix/tests cleanup #11028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 3, 2020
Merged

Bug fix/tests cleanup #11028

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d31779
make http_replication tests clean up their collections
jsteemann Jan 30, 2020
a471de7
remove unneeded fuerte dependency from arangoimport build
jsteemann Jan 30, 2020
1772c90
remove some unused functionality
jsteemann Jan 30, 2020
c28bac0
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/tes…
jsteemann Jan 30, 2020
df8dc26
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/tes…
jsteemann Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unneeded fuerte dependency from arangoimport build
  • Loading branch information
@jsteemann
jsteemann committed Jan 30, 2020
commit a471de73718857eee10b581c431c3aed7b6ab42e
17 changes: 8 additions & 9 deletions arangosh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangobench PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -139,7 +139,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangobackup PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangobackup PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangobackup PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -198,7 +198,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangodump PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangodump PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangodump PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -254,7 +254,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangoexport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangoexport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangoexport PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -290,7 +290,6 @@ target_link_libraries(${BIN_ARANGOIMPORT}
arango
${MSVC_LIBS}
${SYSTEM_LIBRARIES}
fuerte
boost_system
boost_boost
arango_shell
Expand Down Expand Up @@ -322,7 +321,7 @@ install_command_alias(arangoimport

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangoimport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangoimport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangoimport PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -379,7 +378,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangorestore PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangorestore PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangorestore PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -444,7 +443,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangosh PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangosh PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangosh PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down Expand Up @@ -500,7 +499,7 @@ endif ()

if (USE_FAIL_ON_WARNINGS)
if (MSVC)
target_compile_options(arangovpack PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_compile_options(arangovpack PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
else ()
target_compile_options(arangovpack PRIVATE -Werror -Wno-error=deprecated-declarations)
endif ()
Expand Down
0