From 36e953167c88bb3adf2fea7bd75c65c072cc2271 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Dec 29 2013 18:02:36 +0000 Subject: changed mysql55 tests so they only run on C5 --- diff --git a/tests/p_mysql/60_mysqld55_conn_test.sh b/tests/p_mysql/60_mysqld55_conn_test.sh index 9a9eaf8..7b98ade 100755 --- a/tests/p_mysql/60_mysqld55_conn_test.sh +++ b/tests/p_mysql/60_mysqld55_conn_test.sh @@ -1,19 +1,16 @@ #!/bin/sh -t_Log "Running $0 - mysqld client can talk to mysql server." +t_Log "Running $0 - mysqld client can talk to mysql55 server." -if [ $centos_ver -gt 6 ] +if [ $centos_ver -gt 5 ] then - t_Log 'mysql is only supported on C5 and C6, skipping' + t_Log 'mysql55 is only avialable on C5, skipping' t_CheckExitStatus 0 exit 0 fi HostName=$(hostname -s) MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2 | cut -d . -f 1) -# printing both variables for debugging purposes -echo $HostName -echo ${MySqlHostName} if [ $HostName = ${MySqlHostName} ]; then ret_val=0 else diff --git a/tests/p_mysql/65_mysqld55_create_db.sh b/tests/p_mysql/65_mysqld55_create_db.sh index 9697590..43b15bc 100755 --- a/tests/p_mysql/65_mysqld55_create_db.sh +++ b/tests/p_mysql/65_mysqld55_create_db.sh @@ -1,11 +1,12 @@ #!/bin/sh # Author: Athmane Madjoudj +# Christoph Galuschka -t_Log "Running $0 - MySQL create database test" +t_Log "Running $0 - MySQL55 create database test" -if [ $centos_ver -gt 6 ] +if [ $centos_ver -gt 5 ] then - t_Log 'mysql is only supported on C5 and C6, skipping' + t_Log 'mysql55 is only supported on C5, skipping' t_CheckExitStatus 0 exit 0 fi diff --git a/tests/p_mysql/70_mysqld55_drop_db.sh b/tests/p_mysql/70_mysqld55_drop_db.sh index d2ded67..bc50ceb 100755 --- a/tests/p_mysql/70_mysqld55_drop_db.sh +++ b/tests/p_mysql/70_mysqld55_drop_db.sh @@ -1,11 +1,12 @@ #!/bin/sh # Author: Athmane Madjoudj +# Christoph Galuschka t_Log "Running $0 - MySQL drop database test." -if [ $centos_ver -gt 6 ] +if [ $centos_ver -gt 5 ] then - t_Log 'mysql is only supported on C5 and C6, skipping' + t_Log 'mysql55 is only supported on C5, skipping' t_CheckExitStatus 0 exit 0 fi diff --git a/tests/p_mysql/75_mysqld55_grant_test.sh b/tests/p_mysql/75_mysqld55_grant_test.sh index e6e9704..e065363 100755 --- a/tests/p_mysql/75_mysqld55_grant_test.sh +++ b/tests/p_mysql/75_mysqld55_grant_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # Author: Athmane Madjoudj +# Christoph Galuschka t_Log "Running $0 - MySQL GRANT privileges test" -if [ $centos_ver -gt 6 ] +if [ $centos_ver -gt 5 ] then - t_Log 'mysql is only supported on C5 and C6, skipping' + t_Log 'mysql55 is only supported on C5, skipping' t_CheckExitStatus 0 exit 0 fi