diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-23 10:24:14 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-23 10:24:14 -0700 |
| commit | 68d6a773b82ab8c8e259d3888e59aa67350e5531 (patch) | |
| tree | 27e740fa203de4bcfe8ec1d16b6693cd6a67999e | |
| parent | f1050f6f4a777ddff8c2b51e97331a1eadfce8a1 (diff) | |
| parent | 9498bb1bb140784d4348d10fa6b401e6a8bda9c0 (diff) | |
Merge pull request #5927 from ctiller/tracer-tsan
Reorder asserts to avoid TSAN failure
| -rw-r--r-- | test/core/end2end/fixtures/h2_full+trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/fixtures/h2_full+trace.c b/test/core/end2end/fixtures/h2_full+trace.c index 90b0063089..042ee212d7 100644 --- a/test/core/end2end/fixtures/h2_full+trace.c +++ b/test/core/end2end/fixtures/h2_full+trace.c @@ -118,14 +118,14 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { - grpc_end2end_tests(argc, argv, configs[i]); - } - GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); GPR_ASSERT(1 == grpc_tracer_set_enabled("all", 1)); + for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { + grpc_end2end_tests(argc, argv, configs[i]); + } + grpc_shutdown(); return 0; |