Support single digit GCC version

On Fedora 26, "g++ -dumpversion" displays "7", instead of "7.1.1".
Update selective.exp to support single digit GCC version.  Also
remove duplicated [4-9] version check.

	* testsuite/ld-selective/selective.exp: Support single digit
	GCC version.
This commit is contained in:
H.J. Lu 2017-07-11 08:37:48 -07:00
parent 04ac15ab07
commit 61a0857c0f
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2017-07-11 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-selective/selective.exp: Support single digit
GCC version.
2017-07-11 Jiong Wang <jiong.wang@arm.com>
* testsuite/ld-aarch64/dt_textrel.d: Use "#pass" instead of ".*" to

View File

@ -102,7 +102,8 @@ foreach testitem $seltests {
# the functionality we try to test for cannot be expected to work.
set version [remote_exec host "$CXX -dumpversion"]
set version [lindex $version 1]
if [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+|\[4-9\]))\\." $version] {
if { [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+))\\." $version] \
|| [regexp "^(\[1-9\]\[0-9\]+|\[4-9\])" $version] } {
set testflags "$cflags $cxxflags"
setup_xfail {*-*-*}
} else {