From 50c5889f11d7832611f78acc115557d042410aa0 Mon Sep 17 00:00:00 2001
From: Pavel_Shilin <work@pavelshilin.com>
Date: Sun, 25 Feb 2024 02:07:18 +0100
Subject: [PATCH] Added ${EXTRA_SECTION} in test data-manipulation.rec

---
 .../base/config/data-manipulation.conf        | 20 -------------------
 .../config/searchd-with-flexible-ports.conf   |  2 +-
 .../sharding/base/flexible/start-searchd.recb |  2 +-
 .../replication/data-manipulation.rec         |  3 +++
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 test/clt-tests/sharding/base/config/data-manipulation.conf

diff --git a/test/clt-tests/sharding/base/config/data-manipulation.conf b/test/clt-tests/sharding/base/config/data-manipulation.conf
deleted file mode 100644
index 00ce32eadd..0000000000
--- a/test/clt-tests/sharding/base/config/data-manipulation.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-cat << EOF
-common {
-	plugin_dir = /usr/local/lib/manticore
-	lemmatizer_base = /usr/share/manticore/morph/
-}
-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}
-	query_log_format = sphinxql
-	query_log_commands = 1
-	buddy_path = manticore-executor /workdir/src/main.php
-}
-
-EOF
diff --git a/test/clt-tests/sharding/base/config/searchd-with-flexible-ports.conf b/test/clt-tests/sharding/base/config/searchd-with-flexible-ports.conf
index 00ce32eadd..b205752568 100644
--- a/test/clt-tests/sharding/base/config/searchd-with-flexible-ports.conf
+++ b/test/clt-tests/sharding/base/config/searchd-with-flexible-ports.conf
@@ -14,7 +14,7 @@ searchd {
 	data_dir = /var/log/manticore-${INSTANCE}
 	query_log_format = sphinxql
 	query_log_commands = 1
-	buddy_path = manticore-executor /workdir/src/main.php
+	buddy_path = ${EXTRA_SECTION}
 }
 
 EOF
diff --git a/test/clt-tests/sharding/base/flexible/start-searchd.recb b/test/clt-tests/sharding/base/flexible/start-searchd.recb
index 7f1dd34131..a1bedd7431 100644
--- a/test/clt-tests/sharding/base/flexible/start-searchd.recb
+++ b/test/clt-tests/sharding/base/flexible/start-searchd.recb
@@ -2,7 +2,7 @@
 mkdir -p /var/{run,lib,log}/manticore-${INSTANCE}/{a,b,c,d,e,f,g,h,i,j}
 ––– output –––
 ––– input –––
-stdbuf -oL searchd -c test/clt-tests/sharding/base/config/data-manipulation.conf | grep -v precach
+stdbuf -oL searchd -c test/clt-tests/sharding/base/config/searchd-with-flexible-ports.conf | grep -v precach
 ––– output –––
 Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} %{COMMITDATE}) (secondary %{SEMVER} %{COMMITDATE}) (knn %{SEMVER} %{COMMITDATE})
 Copyright (c) 2001-2016, Andrew Aksyonoff
diff --git a/test/clt-tests/sharding/replication/data-manipulation.rec b/test/clt-tests/sharding/replication/data-manipulation.rec
index 00df1d7b50..488d0fb4b3 100644
--- a/test/clt-tests/sharding/replication/data-manipulation.rec
+++ b/test/clt-tests/sharding/replication/data-manipulation.rec
@@ -1,5 +1,8 @@
 ––– block: ./init –––
 ––– input –––
+export EXTRA_SECTION="manticore-executor /workdir/src/main.php"
+––– output –––
+––– input –––
 export INSTANCE=1
 ––– output –––
 ––– block: ../base/flexible/start-searchd –––