diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
| commit | de7edf83ccef1bd95186b059d55266e45db449ba (patch) | |
| tree | 4a4a8976beec2f30b106f79f498cb07e0cbbf4d7 /Makefile | |
| parent | 3ab6f4dc11a4936463a5588b105aad14f5a78a40 (diff) | |
| parent | cb1c389a6c98d72e59fe10e07f4c15156abf62a1 (diff) | |
Merge github.com:grpc/grpc into backoff2
Reintroduce flakiness flag for tests: lb_policies_test is inherently flaky and I don't have time to deflake this week
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1540,8 +1540,6 @@ test_c: buildtests_c $(Q) $(BINDIR)/$(CONFIG)/json_test || ( echo test json_test failed ; exit 1 ) $(E) "[RUN] Testing lame_client_test" $(Q) $(BINDIR)/$(CONFIG)/lame_client_test || ( echo test lame_client_test failed ; exit 1 ) - $(E) "[RUN] Testing lb_policies_test" - $(Q) $(BINDIR)/$(CONFIG)/lb_policies_test || ( echo test lb_policies_test failed ; exit 1 ) $(E) "[RUN] Testing message_compress_test" $(Q) $(BINDIR)/$(CONFIG)/message_compress_test || ( echo test message_compress_test failed ; exit 1 ) $(E) "[RUN] Testing mlog_test" @@ -1623,6 +1621,8 @@ test_c: buildtests_c flaky_test_c: buildtests_c + $(E) "[RUN] Testing lb_policies_test" + $(Q) $(BINDIR)/$(CONFIG)/lb_policies_test || ( echo test lb_policies_test failed ; exit 1 ) test_cxx: test_zookeeper buildtests_cxx |