From 45c5ffb0c0840d7c7cd6489e42708ec79df9ab2e Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 7 Jan 2016 11:27:41 +0000 Subject: Fix tests --- test/CMakeLists.txt | 4 ++++ test/rspamd_mem_pool_test.c | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 241565b19..a2096c128 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,6 +28,10 @@ TARGET_LINK_LIBRARIES(rspamd-test ${RSPAMD_REQUIRED_LIBRARIES}) IF (ENABLE_SNOWBALL MATCHES "ON") TARGET_LINK_LIBRARIES(rspamd-test stemmer) ENDIF() +IF (ENABLE_HYPERSCAN MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-test hs) + SET_TARGET_PROPERTIES(rspamd-test PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() TARGET_LINK_LIBRARIES(rspamd-test rspamd-actrie) ADD_CUSTOM_TARGET(rspamd-func-test COMMAND diff --git a/test/rspamd_mem_pool_test.c b/test/rspamd_mem_pool_test.c index e8813f574..61b9a7a94 100644 --- a/test/rspamd_mem_pool_test.c +++ b/test/rspamd_mem_pool_test.c @@ -32,20 +32,6 @@ rspamd_mem_pool_test_func () g_assert (strncmp (tmp, TEST_BUF, sizeof (TEST_BUF)) == 0); g_assert (strncmp (tmp2, TEST2_BUF, sizeof (TEST2_BUF)) == 0); g_assert (strncmp (tmp3, TEST_BUF, sizeof (TEST_BUF)) == 0); - rspamd_mempool_lock_shared (pool, tmp3); - if ((pid = fork ()) == 0) { - rspamd_mempool_lock_shared (pool, tmp3); - g_assert (*tmp3 == 's'); - *tmp3 = 't'; - rspamd_mempool_unlock_shared (pool, tmp3); - exit (EXIT_SUCCESS); - } - else { - *tmp3 = 's'; - rspamd_mempool_unlock_shared (pool, tmp3); - } - wait (&ret); - g_assert (*tmp3 == 't'); rspamd_mempool_delete (pool); rspamd_mempool_stat (&st); -- cgit v1.2.3