From 3b571d3ef42129a25324e4f6d17d5d3dc513a1c0 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 2 Sep 2016 18:49:54 +0200
Subject: [PATCH] [Test] Fix stats_path

---
 circle.yml                            | 2 +-
 test/functional/configs/fuzzy.conf    | 1 +
 test/functional/configs/lua_test.conf | 1 +
 test/functional/configs/password.conf | 3 ++-
 test/functional/configs/stats.conf    | 1 +
 test/functional/lib/rspamd.robot      | 2 +-
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 2ecec8713..6aa8555e8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,7 @@ dependencies:
 test:
   override:
     - mkdir ../build ; mkdir ../install ; cd ../build
-    - cmake ../rspamd -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
+    - cmake ../rspamd -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
     - make install
     - RSPAMADM=../install/bin/rspamadm RSPAMC=../install/bin/rspamc RSPAMD=../install/bin/rspamd sudo -E robot ../rspamd/test/functional/cases
     - lcov --no-external -b ../rspamd -d ../rspamd -c --output-file coverage.info
diff --git a/test/functional/configs/fuzzy.conf b/test/functional/configs/fuzzy.conf
index fcd744f92..deb518f4c 100644
--- a/test/functional/configs/fuzzy.conf
+++ b/test/functional/configs/fuzzy.conf
@@ -35,6 +35,7 @@ worker {
         bind_socket = "${LOCAL_ADDR}:${PORT_CONTROLLER}";
         count = 1
         secure_ip = ["${LOCAL_ADDR}"];
+	stats_path = "${TMPDIR}/stats.ucl";
 }
 
 worker {
diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf
index 6e93f85ac..a485de4a6 100644
--- a/test/functional/configs/lua_test.conf
+++ b/test/functional/configs/lua_test.conf
@@ -26,6 +26,7 @@ worker {
 	bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER}
 	count = 1
 	secure_ip = ["127.0.0.1", "::1"];
+	stats_path = "${TMPDIR}/stats.ucl"
 }
 
 lua = ${LUA_SCRIPT};
diff --git a/test/functional/configs/password.conf b/test/functional/configs/password.conf
index 96688e996..0280cc6f8 100644
--- a/test/functional/configs/password.conf
+++ b/test/functional/configs/password.conf
@@ -35,4 +35,5 @@ worker {
 	}
 	password = ${PASSWORD};
 	enable_password = ${ENABLE_PASSWORD};
-}
\ No newline at end of file
+	stats_path = "${TMPDIR}/stats.ucl";
+}
diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf
index 6c2893022..7e50d24b0 100644
--- a/test/functional/configs/stats.conf
+++ b/test/functional/configs/stats.conf
@@ -34,6 +34,7 @@ worker {
 		privkey = "${KEY_PVT1}";
 	}
 	secure_ip = ["127.0.0.1", "::1"];
+	stats_path = "${TMPDIR}/stats.ucl";
 }
 
 classifier {
diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index 7ec79ce6e..438aeb1bc 100644
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -109,7 +109,7 @@ Run Rspamd
   Log  ${config}
   Create File  ${tmpdir}/rspamd.conf  ${config}
   ${result} =  Run Process  ${RSPAMD}  -u  ${RSPAMD_USER}  -g  ${RSPAMD_GROUP}
-  ...  -c  ${tmpdir}/rspamd.conf  DBDIR\=${tmpdir}  env:TMPDIR=${tmpdir}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
+  ...  -c  ${tmpdir}/rspamd.conf  env:TMPDIR=${tmpdir}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
   Run Keyword If  ${result.rc} != 0  Log  ${result.stderr}
   ${rspamd_logpos} =  Log Logs  ${tmpdir}/rspamd.log  0
   Should Be Equal As Integers  ${result.rc}  0
-- 
2.39.5