diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-02-28 10:17:55 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-02-28 10:17:55 -0800 |
| commit | 0c84e3c4e68ba9c480074387fadf40fb9b8da873 (patch) | |
| tree | a2c5270374f1386b2d92695c5bb1fac14e869a90 | |
| parent | 4251ba4045b63ed1d863b99855968f08ebd0d46c (diff) | |
| parent | bf01d4f69cedd80ed5668c7f41540d7b5365134c (diff) | |
Merge pull request #886 from ctiller/asan2
Omit some tests, speed up others, prepare for ASAN
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | build.json | 6 | ||||
| -rw-r--r-- | templates/Makefile.template | 2 | ||||
| -rw-r--r-- | test/core/transport/chttp2/stream_map_test.c | 2 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 4 |
5 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 17957584b7..b51d2c0d82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: cpp before_install: - sudo add-apt-repository ppa:yjwong/gflags -y + - sudo add-apt-repository ppa:h-rayflood/llvm -y - sudo apt-get update -qq - - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv + - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv clang-3.5 env: global: - RUBY_VERSION=2.1 @@ -16,6 +17,6 @@ env: script: - rvm use $RUBY_VERSION - gem install bundler - - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 2.0 + - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0 notifications: email: false
\ No newline at end of file diff --git a/build.json b/build.json index dd720c941e..6be1d537ff 100644 --- a/build.json +++ b/build.json @@ -582,7 +582,8 @@ "grpc", "gpr_test_util", "gpr" - ] + ], + "flaky": true }, { "name": "census_statistics_multiple_writers_test", @@ -638,7 +639,8 @@ "grpc", "gpr_test_util", "gpr" - ] + ], + "flaky": true }, { "name": "census_stats_store_test", diff --git a/templates/Makefile.template b/templates/Makefile.template index 0413f19e44..2e50e5d41e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -196,7 +196,7 @@ DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\" LDFLAGS += $(LDFLAGS_$(CONFIG)) ifdef EXTRA_DEFINES -DEFINES += EXTRA_DEFINES +DEFINES += $(EXTRA_DEFINES) endif CFLAGS += -std=c89 -pedantic diff --git a/test/core/transport/chttp2/stream_map_test.c b/test/core/transport/chttp2/stream_map_test.c index 6b91bdf14f..d678e0af73 100644 --- a/test/core/transport/chttp2/stream_map_test.c +++ b/test/core/transport/chttp2/stream_map_test.c @@ -213,7 +213,7 @@ int main(int argc, char **argv) { test_empty_find(); test_double_deletion(); - while (n < 10000000) { + while (n < 100000) { test_basic_add_find(n); test_delete_evens_sweep(n); test_delete_evens_incremental(n); diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index f84bd9dac9..772856b9c7 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -32,7 +32,7 @@ "name": "census_hash_table_test" }, { - "flaky": false, + "flaky": true, "language": "c", "name": "census_statistics_multiple_writers_circular_buffer_test" }, @@ -52,7 +52,7 @@ "name": "census_statistics_quick_test" }, { - "flaky": false, + "flaky": true, "language": "c", "name": "census_statistics_small_log_test" }, |