aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--build.yaml2
-rw-r--r--tools/run_tests/generated/tests.json4
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 13a28b9797..8138f1adf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1886,8 +1886,6 @@ test_cxx: buildtests_cxx
$(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 )
$(E) "[RUN] Testing grpclb_test"
$(Q) $(BINDIR)/$(CONFIG)/grpclb_test || ( echo test grpclb_test failed ; exit 1 )
- $(E) "[RUN] Testing hybrid_end2end_test"
- $(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
$(E) "[RUN] Testing interop_test"
$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
$(E) "[RUN] Testing mock_test"
@@ -1923,6 +1921,8 @@ test_cxx: buildtests_cxx
flaky_test_cxx: buildtests_cxx
+ $(E) "[RUN] Testing hybrid_end2end_test"
+ $(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
test_python: static_c
diff --git a/build.yaml b/build.yaml
index 5f6e0bbfdd..96f27679f4 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3288,7 +3288,7 @@ targets:
- linux
- posix
- name: hybrid_end2end_test
- gtest: true
+ flaky: true
build: test
language: c++
src:
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 5c72bc96a5..fb7a72c4ff 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2856,8 +2856,8 @@
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
- "flaky": false,
- "gtest": true,
+ "flaky": true,
+ "gtest": false,
"language": "c++",
"name": "hybrid_end2end_test",
"platforms": [