main: close loop after it's finished to please valgrind

also disabled priming and TA signalisation during tests

diff --git a/daemon/main.c b/daemon/main.c
index 276f0fb7f40296f7e00c4c784edb754cf3630475..5c25e4cd6f7b161e8e75ebf5b54d2ca20dc9a651 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -436,6 +436,7 @@ int main(int argc, char **argv)
        char *moduledir = MODULEDIR;
        const char *config = NULL;
        int control_fd = -1;
+       uv_loop_t *loop = NULL;
 
        /* Long options. */
        int c = 0, li = 0, ret = 0;
@@ -656,7 +657,7 @@ int main(int argc, char **argv)
        engine_set_moduledir(&engine, moduledir);
        
        /* Block signals. */
-       uv_loop_t *loop = uv_default_loop();
+       loop = uv_default_loop();
        uv_signal_t sigint, sigterm;
        uv_signal_init(loop, &sigint);
        uv_signal_init(loop, &sigterm);
@@ -766,6 +767,9 @@ int main(int argc, char **argv)
 cleanup:/* Cleanup. */
        engine_deinit(&engine);
        worker_reclaim(worker);
+       if (loop != NULL) {
+               uv_loop_close(loop);    
+       }
        mp_delete(pool.ctx);
        array_clear(addr_set);
        array_clear(tls_set);

diff --git a/tests/config/test.cfg b/tests/config/test.cfg
index 0719193e8d15cbadf57fd99deb97bdb897f5f023..e4aff30472ec6c1a9f5a2888d4e0d559e21f6a7d 100644 (file)
--- a/tests/config/test.cfg
+++ b/tests/config/test.cfg
@@ -28,6 +28,10 @@ for k, v in pairs(tapered) do
        _G[k] = v
 end
 
+-- don't send priming queries etc.
+modules.unload 'priming'
+modules.unload 'ta_signal_query'
+
 -- load test
 local tests = dofile(env.TEST_FILE)