diff options
author | 2016-11-07 10:25:55 -0800 | |
---|---|---|
committer | 2016-11-07 10:25:55 -0800 | |
commit | 4be8afc7edacc5b4501c83997d22432dd1ecbc91 (patch) | |
tree | 8c083279d83366a884e936b652a81166915f44de /test/core/end2end/end2end_tests.h | |
parent | 5ebd327cf59cafdf129e33d5885cf31cc75ac737 (diff) | |
parent | b32149461a3e04ae41fee5b414587253582aa435 (diff) |
Merge remote-tracking branch 'upstream/master' into core-end2end-tests-cronet-update
Diffstat (limited to 'test/core/end2end/end2end_tests.h')
-rw-r--r-- | test/core/end2end/end2end_tests.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 0124787bd0..f25e90b5f6 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -43,7 +43,7 @@ typedef struct grpc_end2end_test_config grpc_end2end_test_config; #define FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION 2 #define FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS 4 #define FEATURE_MASK_SUPPORTS_REQUEST_PROXYING 8 -#define FEATURE_MASK_SUPPORTS_QUERY_ARGS 16 +#define FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL 16 #define FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER 32 #define FAIL_AUTH_CHECK_SERVER_ARG_NAME "fail_auth_check" @@ -61,7 +61,7 @@ struct grpc_end2end_test_config { grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args, grpc_channel_args *server_args); void (*init_client)(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, const char *query_args); + grpc_channel_args *client_args); void (*init_server)(grpc_end2end_test_fixture *f, grpc_channel_args *server_args); void (*tear_down_data)(grpc_end2end_test_fixture *f); |