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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1f978bf0c25720db193ff3e38b851bd664468ed1..90bbed7a2be5ecedc898e8898c34ca849d98a063 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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

diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index 8d58c1612d9ac3fc776d1469178a37a383c73c62..11c8f3fe69501f502f94e4012ad03af6682382c0 100644 (file)
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -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 {