From 39ae8c05f217d8c3cfc0a898351fd754224032e6 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 27 2019 21:16:26 +0000 Subject: lamp/mysql55 tests are only valid in CentOS5 --- diff --git a/tests/r_lamp/45_basic_lamp_mysql55.sh b/tests/r_lamp/45_basic_lamp_mysql55.sh index 04c48e3..0c8ecbc 100755 --- a/tests/r_lamp/45_basic_lamp_mysql55.sh +++ b/tests/r_lamp/45_basic_lamp_mysql55.sh @@ -12,6 +12,8 @@ if [ $centos_ver = 5 ] then t_ServiceControl mysqld stop t_ServiceControl mysql55-mysqld start +else + exit 0 fi t_ServiceControl httpd restart diff --git a/tests/r_lamp/50_lamp_check_mysql55.sh b/tests/r_lamp/50_lamp_check_mysql55.sh index d81edd4..064f066 100755 --- a/tests/r_lamp/50_lamp_check_mysql55.sh +++ b/tests/r_lamp/50_lamp_check_mysql55.sh @@ -9,7 +9,7 @@ # starting with 5.10, we have to differ between mysql55 and mysql -if [ "$centos_ver" = "7" ] ; then +if [ "$centos_ver" -ge 7 ] ; then t_Log "no mysql55 on CentOS 7 ... SKIP" exit 0 fi