Merge c668dc3 into de6e35e

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
 }

test/clt-tests/core/show-settings.rec

@@ -13,13 +13,13 @@ mysql -h0 -P1306 -e "SHOW SETTINGS;"
 | searchd.listen             | 1306:mysql41                                               |
 | searchd.listen             | 1312                                                       |
 | searchd.listen             | 1308:http                                                  |
-| searchd.log                | /var/log/manticore-1/searchd.log                           |
-| searchd.query_log          | /var/log/manticore-1/query.log                             |
-| searchd.pid_file           | /var/log/manticore-1/searchd.pid                           |
-| searchd.data_dir           | /var/log/manticore-1                                       |
+| searchd.log                | /tmp/manticore-1/searchd.log                               |
+| searchd.query_log          | /tmp/manticore-1/query.log                                 |
+| searchd.pid_file           | /tmp/manticore-1/searchd.pid                               |
+| searchd.data_dir           | /tmp/manticore-1                                           |
 | searchd.query_log_format   | sphinxql                                                   |
 | searchd.query_log_commands | 1                                                          |
-| searchd.binlog_path        | /var/log/manticore-1/binlog                                |
+| searchd.binlog_path        | /tmp/manticore-1/binlog                                    |
 | common.plugin_dir          | /usr/local/lib/manticore                                   |
 | common.lemmatizer_base     | /usr/share/manticore/morph/                                |
 +----------------------------+------------------------------------------------------------+