upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1119-disable-time-consuming-tests-benchmarks-when-tsan-is-enabled' into 'master'

Browse source 
Disable time consuming tests when compiling with Thread Sanitizer

See merge request isc-projects/bind9!2365
This commit is contained in:
Ondřej Surý 2019-10-02 08:49:00 -04:00
commit 5be620bd35
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/tests/rbt_test.c
View file

@ -1202,7 +1202,7 @@ rbt_nodechain(void **state) {
test_context_teardown(ctx);
}
#ifdef DNS_BENCHMARK_TESTS
#if defined(DNS_BENCHMARK_TESTS) && !defined(__SANITIZE_THREAD__)
/*
* XXXMUKS: Don't delete this code. It is useful in benchmarking the
@ -1317,7 +1317,7 @@ benchmark(void **state) {
dns_rbt_destroy(&mytree);
}
#endif /* DNS_BENCHMARK_TESTS */
#endif /* defined(DNS_BENCHMARK_TESTS) && !defined(__SANITIZE_THREAD__) */
int
main(void) {
@ -1342,9 +1342,9 @@ main(void) {
_setup, _teardown),
cmocka_unit_test_setup_teardown(rbt_nodechain,
_setup, _teardown),
#ifdef DNS_BENCHMARK_TESTS
#if defined(DNS_BENCHMARK_TESTS) && !defined(__SANITIZE_THREAD__)
cmocka_unit_test_setup_teardown(benchmark, _setup, _teardown),
#endif /* DNS_BENCHMARK_TESTS */
#endif /* defined(DNS_BENCHMARK_TESTS) && !defined(__SANITIZE_THREAD__) */
};
return (cmocka_run_group_tests(tests, NULL, NULL));

4
lib/isc/include/isc/util.h
View file

@ -194,6 +194,10 @@
#define __SANITIZE_ADDRESS__ 1
#endif
#if __has_feature(thread_sanitizer)
#define __SANITIZE_THREAD__ 1
#endif
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 6)
#define STATIC_ASSERT(cond, msg) _Static_assert(cond, msg)
#elif __has_feature(c_static_assert)

6
lib/isc/tests/mem_test.c
View file

@ -384,6 +384,8 @@ isc_mem_traceflag_test(void **state) {
}
#endif
#if !defined(__SANITIZE_THREAD__)
#define ITERS 512
#define NUM_ITEMS 1024 //768
#define ITEM_SIZE 65534
@ -503,6 +505,8 @@ isc_mempool_benchmark(void **state) {
isc_mutex_destroy(&mplock);
}
#endif /* __SANITIZE_THREAD */
/*
* Main
*/
@ -525,10 +529,12 @@ main(void) {
cmocka_unit_test_setup_teardown(isc_mem_traceflag_test,
_setup, _teardown),
#endif
#if !defined(__SANITIZE_THREAD__)
cmocka_unit_test_setup_teardown(isc_mem_benchmark,
_setup, _teardown),
cmocka_unit_test_setup_teardown(isc_mempool_benchmark,
_setup, _teardown),
#endif /* __SANITIZE_THREAD__ */
};
return (cmocka_run_group_tests(tests, NULL, NULL));