diff --git a/localtests/test.sh b/localtests/test.sh index b78fa87..9ab0c18 100755 --- a/localtests/test.sh +++ b/localtests/test.sh @@ -86,7 +86,7 @@ test_single() { if [ -f $tests_path/$test_name/ignore_versions ] ; then ignore_versions=$(cat $tests_path/$test_name/ignore_versions) mysql_version=$(gh-ost-test-mysql-master -s -s -e "select @@version") - if echo "$mysql_version" | egrep "$ignore_versions" ; then + if echo "$mysql_version" | egrep "^${ignore_versions}" ; then echo "ignoring" return 0 fi diff --git a/localtests/tz-datetime-ts/ignore_versions b/localtests/tz-datetime-ts/ignore_versions new file mode 100644 index 0000000..7acd3f0 --- /dev/null +++ b/localtests/tz-datetime-ts/ignore_versions @@ -0,0 +1 @@ +(5.5) diff --git a/localtests/tz/ignore_versions b/localtests/tz/ignore_versions new file mode 100644 index 0000000..7acd3f0 --- /dev/null +++ b/localtests/tz/ignore_versions @@ -0,0 +1 @@ +(5.5) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index a1fa646..2e43009 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -49,6 +49,6 @@ test_mysql_version() { echo "Building..." . script/build # Test all versions: -find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do +find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort | while read mysql_version ; do test_mysql_version "$mysql_version" done