From 7a1b41523792465530d4a8bc4bfebb71c3d67e08 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Wed, 27 May 2015 16:41:55 -0700
Subject: [PATCH] Re-enable some tests
---
Makefile | 16 ++++++++--------
build.json | 4 ----
tools/run_tests/tests.json | 8 ++++----
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 5f539ff89a..cdd675bce4 100644
--- a/Makefile
+++ b/Makefile
@@ -1183,6 +1183,14 @@ test_c: buildtests_c
$(Q) $(BINDIR)/$(CONFIG)/bin_encoder_test || ( echo test bin_encoder_test failed ; exit 1 )
$(E) "[RUN] Testing census_hash_table_test"
$(Q) $(BINDIR)/$(CONFIG)/census_hash_table_test || ( echo test census_hash_table_test failed ; exit 1 )
+ $(E) "[RUN] Testing census_statistics_multiple_writers_test"
+ $(Q) $(BINDIR)/$(CONFIG)/census_statistics_multiple_writers_test || ( echo test census_statistics_multiple_writers_test failed ; exit 1 )
+ $(E) "[RUN] Testing census_statistics_performance_test"
+ $(Q) $(BINDIR)/$(CONFIG)/census_statistics_performance_test || ( echo test census_statistics_performance_test failed ; exit 1 )
+ $(E) "[RUN] Testing census_statistics_quick_test"
+ $(Q) $(BINDIR)/$(CONFIG)/census_statistics_quick_test || ( echo test census_statistics_quick_test failed ; exit 1 )
+ $(E) "[RUN] Testing census_statistics_small_log_test"
+ $(Q) $(BINDIR)/$(CONFIG)/census_statistics_small_log_test || ( echo test census_statistics_small_log_test failed ; exit 1 )
$(E) "[RUN] Testing census_stub_test"
$(Q) $(BINDIR)/$(CONFIG)/census_stub_test || ( echo test census_stub_test failed ; exit 1 )
$(E) "[RUN] Testing census_window_stats_test"
@@ -2002,14 +2010,6 @@ test_c: buildtests_c
flaky_test_c: buildtests_c
$(E) "[RUN] Testing census_statistics_multiple_writers_circular_buffer_test"
$(Q) $(BINDIR)/$(CONFIG)/census_statistics_multiple_writers_circular_buffer_test || ( echo test census_statistics_multiple_writers_circular_buffer_test failed ; exit 1 )
- $(E) "[RUN] Testing census_statistics_multiple_writers_test"
- $(Q) $(BINDIR)/$(CONFIG)/census_statistics_multiple_writers_test || ( echo test census_statistics_multiple_writers_test failed ; exit 1 )
- $(E) "[RUN] Testing census_statistics_performance_test"
- $(Q) $(BINDIR)/$(CONFIG)/census_statistics_performance_test || ( echo test census_statistics_performance_test failed ; exit 1 )
- $(E) "[RUN] Testing census_statistics_quick_test"
- $(Q) $(BINDIR)/$(CONFIG)/census_statistics_quick_test || ( echo test census_statistics_quick_test failed ; exit 1 )
- $(E) "[RUN] Testing census_statistics_small_log_test"
- $(Q) $(BINDIR)/$(CONFIG)/census_statistics_small_log_test || ( echo test census_statistics_small_log_test failed ; exit 1 )
$(E) "[RUN] Testing chttp2_fake_security_cancel_after_accept_test"
$(Q) $(BINDIR)/$(CONFIG)/chttp2_fake_security_cancel_after_accept_test || ( echo test chttp2_fake_security_cancel_after_accept_test failed ; exit 1 )
$(E) "[RUN] Testing chttp2_fake_security_invoke_large_request_test"
diff --git a/build.json b/build.json
index b893692205..b253b35fcd 100644
--- a/build.json
+++ b/build.json
@@ -820,7 +820,6 @@
},
{
"name": "census_statistics_multiple_writers_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -835,7 +834,6 @@
},
{
"name": "census_statistics_performance_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -850,7 +848,6 @@
},
{
"name": "census_statistics_quick_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -865,7 +862,6 @@
},
{
"name": "census_statistics_small_log_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index cd94454d42..c34f0f2036 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -65,7 +65,7 @@
]
},
{
- "flaky": true,
+ "flaky": false,
"language": "c",
"name": "census_statistics_multiple_writers_test",
"platforms": [
@@ -74,7 +74,7 @@
]
},
{
- "flaky": true,
+ "flaky": false,
"language": "c",
"name": "census_statistics_performance_test",
"platforms": [
@@ -83,7 +83,7 @@
]
},
{
- "flaky": true,
+ "flaky": false,
"language": "c",
"name": "census_statistics_quick_test",
"platforms": [
@@ -92,7 +92,7 @@
]
},
{
- "flaky": true,
+ "flaky": false,
"language": "c",
"name": "census_statistics_small_log_test",
"platforms": [
--
GitLab