Skip to content

Commit

Permalink
Bug #32137594: UPDATE XPLUGIN UNIT TESTS TO THE MOST RECENT GOOGLETES…
Browse files Browse the repository at this point in the history
…T PACKAGE

Post-push fix for broken -Werror build on macOS:
ignore some clang warnings about code generated by googlemock.

Change-Id: I03edf3be41862e54974d93e6d637e6ae8c0931c1
  • Loading branch information
Tor Didriksen committed Nov 25, 2020
1 parent aa2987d commit 7e694e9
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions unittest/gunit/xplugin/xpl/CMakeLists.txt
Expand Up @@ -45,6 +45,21 @@ IF(MY_COMPILER_IS_SUNPRO)
)
ENDIF()

# googlemock uses GTEST_DISALLOW_ASSIGN_ which will generate:
# definition of implicit copy constructor for ....
# is deprecated because it has a user-declared copy assignment operator
IF(APPLE)
ADD_COMPILE_FLAGS(
account_verification_handler_t.cc
admin_cmd_index_t.cc
index_field_t.cc
listener_unix_socket_t.cc
protocol_decoder_t.cc
timeouts_t.cc
COMPILE_FLAGS "-Wno-deprecated"
)
ENDIF()

IF(MYSQLX_ADDITIONAL_TESTS_ENABLE)
INCLUDE(mysql_function_names.cmake)
LIST(APPEND XPL_TEST_SRC "${MYSQLX_GENERATE_DIR}/mysql_function_names_t.cc")
Expand Down

0 comments on commit 7e694e9

Please sign in to comment.