File obs-server-2.7.1-0016-api-Autodetect-mysqld-and... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.7.1-0016-api-Autodetect-mysqld-and-memcached-pathname-for-api.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Currently displaying revision a54184d12a5b83bb4ed61fe52fa6ec1e , Show latest

From a961b9b69a47fb5d8e2825590b4af7a8a8b1129e Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Wed, 29 Jun 2016 23:06:59 +0100
Subject: [PATCH 16/29] [api] Autodetect mysqld and memcached pathname for api
 test.

Different distros have mysqld and memcached binaries in different places.
This change makes api test to search for these binaries in
"/usr/bin", "/usr/sbin" and "/usr/libexec" directories.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 src/api/script/api_test_in_spec.sh | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/api/script/api_test_in_spec.sh b/src/api/script/api_test_in_spec.sh
index 7aa738e..efd52bb 100755
--- a/src/api/script/api_test_in_spec.sh
+++ b/src/api/script/api_test_in_spec.sh
@@ -6,7 +6,30 @@ TEMP_DIR=$BASE_DIR/tmp
 MYSQL_BASEDIR=$TEMP_DIR/mysql/
 MYSQL_DATADIR=$MYSQL_BASEDIR/data
 MYSQL_SOCKET=$MYSQL_BASEDIR/mysql.socket
+MYSQL_SERVER=
+for dir in /usr/bin /usr/sbin /usr/libexec; do
+  if [ -x "$dir/mysqld" ]; then
+    MYSQL_SERVER="$dir/mysqld"
+    break
+  fi
+done
+if [ -z "$MYSQL_SERVER" ]; then
+  echo mysqld not found >&2
+  exit 1
+fi
+
 MEMCACHED_PID_FILE=$TEMP_DIR/memcached.pid
+MEMCACHED_SERVER=
+for dir in /usr/bin /usr/sbin /usr/libexec; do
+  if [ -x "$dir/memcached" ]; then
+    MEMCACHED_SERVER="$dir/memcached"
+    break
+  fi
+done
+if [ -z "$MEMCACHED_SERVER" ]; then
+  echo memcached not found >&2
+  exit 1
+fi
 
 MYSQLD_USER=`whoami`
 if [[ $EUID == 0 ]];then
@@ -30,7 +53,7 @@ rm -rf $MYSQL_DATADIR $MYSQL_SOCKET
 mkdir -p $MYSQL_BASEDIR
 chown -R $MYSQLD_USER $MYSQL_BASEDIR
 mysql_install_db --user=$MYSQLD_USER --datadir=$MYSQL_DATADIR
-/usr/sbin/mysqld --user=$MYSQLD_USER --datadir=$MYSQL_DATADIR --skip-networking --socket=$MYSQL_SOCKET &
+$MYSQL_SERVER --user=$MYSQLD_USER --datadir=$MYSQL_DATADIR --skip-networking --socket=$MYSQL_SOCKET &
 sleep 2
 
 ##################### api
@@ -59,7 +82,7 @@ test:
 
 EOF
 
-/usr/sbin/memcached $MEMCACHED_USER -l 127.0.0.1 -d -P $MEMCACHED_PID_FILE || exit 1
+$MEMCACHED_SERVER $MEMCACHED_USER -l 127.0.0.1 -d -P $MEMCACHED_PID_FILE || exit 1
 
 # migration test
 export RAILS_ENV=migrate
-- 
2.7.4

Places

File obs-server-2.7.1-0016-api-Autodetect-mysqld-and-memcached-pathname-for-api.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Places