File obs-server-2.8-0014-api-Autodetect-mysqld-and-m... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.8-0014-api-Autodetect-mysqld-and-memcached-pathname-for-api.patch of Package obs-server (Revision 2192c917e32dcb40249c247f2d5204b0)

Currently displaying revision 2192c917e32dcb40249c247f2d5204b0 , Show latest

From a4f86ab074e55ed178ead956d0765fbde58fe4d5 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Wed, 29 Jun 2016 23:06:59 +0100
Subject: [PATCH] [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 | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/api/script/api_test_in_spec.sh b/src/api/script/api_test_in_spec.sh
index 012a02d..fb9a9e9 100755
--- a/src/api/script/api_test_in_spec.sh
+++ b/src/api/script/api_test_in_spec.sh
@@ -9,6 +9,30 @@ MEMCACHED_PID_FILE=$TEMP_DIR/memcached.pid
 MYSQL_SOCKET_DIR=`mktemp -d`
 MYSQL_SOCKET=$MYSQL_SOCKET_DIR/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_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
   MYSQLD_USER=mysql
@@ -31,7 +55,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
@@ -60,7 +84,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.9.4

Places

File obs-server-2.8-0014-api-Autodetect-mysqld-and-memcached-pathname-for-api.patch of Package obs-server (Revision 2192c917e32dcb40249c247f2d5204b0)

Places