aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-05-28 12:34:04 -0700
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-05-28 12:34:04 -0700
commit5ae14d1a5bf73bbe3cc2cfbf40b85e75f9f8d8b8 (patch)
tree35771ea223175027af3ecd53e2a009b070154944
parentbea00481717ed02dba5745fe240bee81359ad6af (diff)
parent7a1b41523792465530d4a8bc4bfebb71c3d67e08 (diff)
Merge pull request #1774 from ctiller/maybe-we-should-run-some-more-tests
Re-enable some tests
-rw-r--r--Makefile16
-rw-r--r--build.json4
-rw-r--r--tools/run_tests/tests.json8
3 files changed, 12 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index f56edec7e6..6b9a122785 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 662d094829..0a42d70967 100644
--- a/build.json
+++ b/build.json
@@ -830,7 +830,6 @@
},
{
"name": "census_statistics_multiple_writers_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -845,7 +844,6 @@
},
{
"name": "census_statistics_performance_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -860,7 +858,6 @@
},
{
"name": "census_statistics_quick_test",
- "flaky": true,
"build": "test",
"language": "c",
"src": [
@@ -875,7 +872,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": [