Fix tests

diff --git a/src/libcryptobox/siphash/ref.c b/src/libcryptobox/siphash/ref.c
index 1a09f2066712659de4a098e0c3012083cd000c47..cbd244f5f72036941c92aa7e0796d5a42b7d0151 100644 (file)
--- a/src/libcryptobox/siphash/ref.c
+++ b/src/libcryptobox/siphash/ref.c
@@ -31,14 +31,6 @@
 
 #define ROTL(x,b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) )
 
-#define U32TO8_LE(p, v)                                         \
-  (p)[0] = (uint8_t)((v)      ); (p)[1] = (uint8_t)((v) >>  8); \
-  (p)[2] = (uint8_t)((v) >> 16); (p)[3] = (uint8_t)((v) >> 24);
-
-#define U64TO8_LE(p, v)                        \
-  U32TO8_LE((p),     (uint32_t)((v)      ));   \
-  U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
-
 #if BYTE_ORDER != LITTLE_ENDIAN
 #define U8TO64_LE(p) \
        (((uint64_t)((p)[0]) <<  0) | \

diff --git a/src/libutil/util.c b/src/libutil/util.c
index 994f475b9b1d1b34c7223d21325cfae9fdecede7..dc9e0320181d9e6f273b8282f58ada59bd63e20c 100644 (file)
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -1990,15 +1990,16 @@ void
 rspamd_config_libs (struct rspamd_external_libs_ctx *ctx,
                struct rspamd_config *cfg)
 {
-       g_assert (ctx != NULL);
        g_assert (cfg != NULL);
 
-       if (cfg->local_addrs) {
-               if (!rspamd_map_add (cfg, cfg->local_addrs,
-                               "Local addresses", rspamd_radix_read, rspamd_radix_fin,
-                               (void **) ctx->local_addrs)) {
-                       radix_add_generic_iplist (cfg->local_addrs,
-                                       (radix_compressed_t **)ctx->local_addrs);
+       if (ctx != NULL) {
+               if (cfg->local_addrs) {
+                       if (!rspamd_map_add (cfg, cfg->local_addrs,
+                                       "Local addresses", rspamd_radix_read, rspamd_radix_fin,
+                                       (void **) ctx->local_addrs)) {
+                               radix_add_generic_iplist (cfg->local_addrs,
+                                               (radix_compressed_t **)ctx->local_addrs);
+                       }
                }
        }
 }

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 241565b19880cfb9b442517e5d4900050f1ba7a1..a2096c128f3cd1aef7daed0106cdff65172ecc95 100644 (file)
--- 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 e8813f574d36f5260d9b5119e5ada9f8791707a6..61b9a7a9460ffdefe97802ae331b299bc242e5fb 100644 (file)
--- 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);