From f26582d5476a9a91a6ab646d755dcc96dcee33e4 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Feb 2015 16:01:13 -0800 Subject: Add asan/tsan tests --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 17957584b7..17bd882e7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,19 @@ 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 matrix: - CONFIG=dbg TEST=c - CONFIG=dbg TEST=c++ + - CONFIG=asan TEST=c + - CONFIG=asan TEST=c++ + - CONFIG=tsan TEST=c + - CONFIG=tsan TEST=c++ - CONFIG=opt TEST=c - CONFIG=opt TEST=c++ - CONFIG=opt TEST=node @@ -16,6 +21,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 -- cgit v1.2.3 From f5065c5b65035eb0999877391cf8dfd634ad4a5f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Feb 2015 16:17:39 -0800 Subject: Enable asan for C core Also speed up a test, and disable some rarely touched but long running tests --- .travis.yml | 3 --- build.json | 6 ++++-- templates/Makefile.template | 2 +- test/core/transport/chttp2/stream_map_test.c | 2 +- tools/run_tests/tests.json | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 17bd882e7c..68097a8182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ env: - CONFIG=dbg TEST=c - CONFIG=dbg TEST=c++ - CONFIG=asan TEST=c - - CONFIG=asan TEST=c++ - - CONFIG=tsan TEST=c - - CONFIG=tsan TEST=c++ - CONFIG=opt TEST=c - CONFIG=opt TEST=c++ - CONFIG=opt TEST=node diff --git a/build.json b/build.json index 2079b2cce7..ff4c7fac06 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" }, -- cgit v1.2.3 From bf01d4f69cedd80ed5668c7f41540d7b5365134c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Feb 2015 16:35:21 -0800 Subject: Ignore the ASAN bits, get the fixes in --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 68097a8182..b51d2c0d82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ env: matrix: - CONFIG=dbg TEST=c - CONFIG=dbg TEST=c++ - - CONFIG=asan TEST=c - CONFIG=opt TEST=c - CONFIG=opt TEST=c++ - CONFIG=opt TEST=node -- cgit v1.2.3