Merge 270c799 into 17ecd12

Author: PavelShilin89

test/clt-tests/base/replication/start-searchd-precach.recb

@@ -1,5 +1,8 @@
 ––– input –––
-mkdir -p /var/{run,lib,log}/manticore-${INSTANCE}/{a,b,c,d,e,f,g,h,i,j}
+mkdir -p /tmp/manticore-${INSTANCE}
+––– output –––
+––– input –––
+chmod -R 777 /tmp/manticore-${INSTANCE}
 ––– output –––
 ––– input –––
 stdbuf -oL searchd -c test/clt-tests/base/searchd-with-flexible-ports.conf | grep -v precach
@@ -14,6 +17,6 @@ listening on all interfaces for mysql, port=%{NUMBER}
 listening on all interfaces for sphinx and http(s), port=%{NUMBER}
 listening on all interfaces for sphinx and http(s), port=%{NUMBER}
 ––– input –––
-if timeout 10 grep -qm1 'accepting connections' <(tail -n 1000 -f /var/log/manticore-${INSTANCE}/searchd.log); then echo 'Accepting connections!'; else echo 'Timeout or failed!'; fi
+if timeout 10 grep -qm1 'accepting connections' <(tail -n 1000 -f /tmp/manticore-${INSTANCE}/searchd.log); then echo 'Accepting connections!'; else echo 'Timeout or failed!'; fi
 ––– output –––
 Accepting connections!

test/clt-tests/base/searchd-with-flexible-ports.conf

@@ -8,10 +8,10 @@ searchd {
 	listen = ${INSTANCE}306:mysql41
 	listen = ${INSTANCE}312
 	listen = ${INSTANCE}308:http
-	log = /var/log/manticore-${INSTANCE}/searchd.log
-	query_log = /var/log/manticore-${INSTANCE}/query.log
-	pid_file = /var/log/manticore-${INSTANCE}/searchd.pid
-	data_dir = /var/log/manticore-${INSTANCE}
+	log = /tmp/manticore-${INSTANCE}/searchd.log
+	query_log = /tmp/manticore-${INSTANCE}/query.log
+	pid_file = /tmp/manticore-${INSTANCE}/searchd.pid
+	data_dir = /tmp/manticore-${INSTANCE}
 	query_log_format = sphinxql
 	query_log_commands = 1
 }