[libdbd-mysql-perl] 01/02: autopkgtest: fix smoke test for MySQL case.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdbd-mysql-perl.

commit a88ad3d74f3d3acc37376dc01b19365830bdfdb9
Author: gregor herrmann <gre...@debian.org>
Date:   Sat Oct 22 14:23:10 2016 +0200

    autopkgtest: fix smoke test for MySQL case.
    
    MySQL 5.7 has deprecated the mysql_install_db command, rewritten it and
    thrown away most command line options. Use `/usr/sbin/mysqld --initialize'
    as the proposed alternative now.
    
    Thanks: ci.debian.net
---
 debian/tests/control              | 2 +-
 debian/tests/pkg-perl/smoke-setup | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 019c203..0944d4f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -9,4 +9,4 @@ Test-Command: /usr/share/pkg-perl-autopkgtest/runner build-deps
 Depends: @, libdbi-perl, libtest-deep-perl, perl, procps, mariadb-server, 
pkg-perl-autopkgtest
 
 Test-Command: /usr/share/pkg-perl-autopkgtest/runner build-deps
-Depends: @, libdbi-perl, libtest-deep-perl, perl, procps, mysql-server, 
pkg-perl-autopkgtest
+Depends: @, libdbi-perl, libtest-deep-perl, perl, procps, mysql-server (>= 
5.7), pkg-perl-autopkgtest
diff --git a/debian/tests/pkg-perl/smoke-setup 
b/debian/tests/pkg-perl/smoke-setup
index a0e57b9..0ca0cc8 100755
--- a/debian/tests/pkg-perl/smoke-setup
+++ b/debian/tests/pkg-perl/smoke-setup
@@ -4,8 +4,13 @@
 
 # redirect STDERR to STDIN, autopkgtest fails otherwise
 
-mysql_install_db --no-defaults --datadir=${MYSQL_DIR} --force 
--skip-name-resolve --explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
-/usr/sbin/mysqld --no-defaults --user=${MYSQL_USER} 
--socket=${MYSQL_UNIX_PORT} --datadir=${MYSQL_DIR} --pid-file=${MYSQL_PIDFILE} 
--skip-networking  --skip-grant-tables 2>&1 &
+if mysql --version | grep -q MariaDB; then
+       mysql_install_db --no-defaults --datadir=${MYSQL_DIR} --force 
--skip-name-resolve --explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
+else
+       /usr/sbin/mysqld --initialize --datadir=${MYSQL_DIR} 
--explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
+fi
+
+/usr/sbin/mysqld --no-defaults --user=${MYSQL_USER} 
--socket=${MYSQL_UNIX_PORT} --datadir=${MYSQL_DIR} --pid-file=${MYSQL_PIDFILE} 
--explicit_defaults_for_timestamp --skip-networking  --skip-grant-tables 2>&1 &
 attempts=0
 while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping 2>&1 ; do
        sleep 3

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libdbd-mysql-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits