Skip to content

Commit

Permalink
Use abseil's flags in tests.
Browse files Browse the repository at this point in the history
This replaces gflags. Added TODOs where use of `absl::Duration` or `absl::FlagSaver` might be preferred in follow-up cleanup. Fixes grpc#24493.
  • Loading branch information
Capstan committed Oct 23, 2020
1 parent deaa8e1 commit 7883b51
Show file tree
Hide file tree
Showing 51 changed files with 1,168 additions and 1,031 deletions.
2 changes: 2 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
# Disable abseil-no-namespace: https://bugs.llvm.org/show_bug.cgi?id=47947
Checks: '-*,
abseil-*,
-abseil-no-namespace,
bugprone-*,
-bugprone-integer-division,
-bugprone-narrowing-conversions,
Expand Down
27 changes: 27 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3255,6 +3255,7 @@ target_link_libraries(grpc++_test_config
${_gRPC_PROTOBUF_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gpr
absl::flags_parse
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -3316,6 +3317,7 @@ target_link_libraries(grpc++_test_util
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -9354,6 +9356,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
address_sorting
upb
${_gRPC_BENCHMARK_LIBRARIES}
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -10164,6 +10167,7 @@ target_link_libraries(cli_call_test
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -11350,6 +11354,7 @@ target_link_libraries(grpc_cli
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -11755,6 +11760,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -12104,6 +12110,7 @@ target_link_libraries(http2_client
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -12338,6 +12345,7 @@ target_link_libraries(interop_client
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -12394,6 +12402,7 @@ target_link_libraries(interop_server
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -12437,6 +12446,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -13208,6 +13218,7 @@ target_link_libraries(qps_json_driver
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -13288,6 +13299,7 @@ target_link_libraries(qps_worker
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15404,6 +15416,7 @@ target_link_libraries(xds_interop_client
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15457,6 +15470,7 @@ target_link_libraries(xds_interop_server
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15498,6 +15512,7 @@ target_link_libraries(alts_credentials_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15539,6 +15554,7 @@ target_link_libraries(client_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15580,6 +15596,7 @@ target_link_libraries(hpack_parser_fuzzer_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15621,6 +15638,7 @@ target_link_libraries(http_request_fuzzer_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15662,6 +15680,7 @@ target_link_libraries(http_response_fuzzer_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15703,6 +15722,7 @@ target_link_libraries(json_fuzzer_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15744,6 +15764,7 @@ target_link_libraries(nanopb_fuzzer_response_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15785,6 +15806,7 @@ target_link_libraries(nanopb_fuzzer_serverlist_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15826,6 +15848,7 @@ target_link_libraries(percent_decode_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15867,6 +15890,7 @@ target_link_libraries(percent_encode_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15908,6 +15932,7 @@ target_link_libraries(server_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15949,6 +15974,7 @@ target_link_libraries(ssl_server_fuzzer_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down Expand Up @@ -15990,6 +16016,7 @@ target_link_libraries(uri_fuzzer_test_one_entry
gpr
address_sorting
upb
absl::flags
${_gRPC_GFLAGS_LIBRARIES}
)

Expand Down
5 changes: 0 additions & 5 deletions bazel/grpc_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ def grpc_deps():
actual = "@com_github_google_re2//:re2",
)

native.bind(
name = "gflags",
actual = "@com_github_gflags_gflags//:gflags",
)

native.bind(
name = "grpc_cpp_plugin",
actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin",
Expand Down
Loading

0 comments on commit 7883b51

Please sign in to comment.