@@ -787,7 +787,12 @@ if test "$PHP_GCOV" = "yes"; then
787
787
AC_MSG_ERROR ( [ ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.] )
788
788
fi
789
789
790
- ltp_version_list="1.5 1.6 1.7 1.9 1.10"
790
+ dnl min: 1.5 (i.e. 105, major * 100 + minor for easier comparison)
791
+ ltp_version_min="105"
792
+ dnl non-working versions, e.g. "1.8 1.18";
793
+ dnl remove "none" when introducing the first incompatible LTP version an
794
+ dnl separate any following additions by spaces
795
+ ltp_version_exclude="1.8"
791
796
792
797
AC_CHECK_PROG ( LTP , lcov , lcov )
793
798
AC_CHECK_PROG ( LTP_GENHTML , genhtml , genhtml )
@@ -797,21 +802,30 @@ if test "$PHP_GCOV" = "yes"; then
797
802
if test "$LTP"; then
798
803
AC_CACHE_CHECK ( [ for ltp version] , php_cv_ltp_version , [
799
804
php_cv_ltp_version=invalid
800
- ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
801
- for ltp_check_version in $ltp_version_list; do
802
- if test "$ltp_version" = "$ltp_check_version"; then
803
- php_cv_ltp_version="$ltp_check_version (ok)"
805
+ ltp_version_vars=`$LTP -v 2>/dev/null | $SED -e 's/^.* //' -e 's/\./ /g' | tr -d a-z`
806
+ if test -n "$ltp_version_vars"; then
807
+ set $ltp_version_vars
808
+ ltp_version="${1}.${2}"
809
+ ltp_version_num="`expr ${1} \* 100 + ${2}`"
810
+ if test $ltp_version_num -ge $ltp_version_min; then
811
+ php_cv_ltp_version="$ltp_version (ok)"
812
+ for ltp_check_version in $ltp_version_exclude; do
813
+ if test "$ltp_version" = "$ltp_check_version"; then
814
+ php_cv_ltp_version=invalid
815
+ break
816
+ fi
817
+ done
804
818
fi
805
- done
819
+ fi
806
820
] )
807
821
else
808
- ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list "
822
+ ltp_msg="To enable code coverage reporting you must have LTP installed"
809
823
AC_MSG_ERROR ( [ $ltp_msg] )
810
824
fi
811
825
812
826
case $php_cv_ltp_version in
813
827
""|invalid[ )]
814
- ltp_msg="You must have one of the following versions of LTP : $ltp_version_list (found : $ltp_version )."
828
+ ltp_msg="This LTP version is not supported (found: $ltp_version, min : $ltp_version_min, excluded : $ltp_version_exclude )."
815
829
AC_MSG_ERROR ( [ $ltp_msg] )
816
830
LTP="exit 0;"
817
831
;;
0 commit comments