From ee856f131dc433ff3c7522a4782aed7ac6de4f4a Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 20 Jan 2017 12:54:45 +0000 Subject: [PATCH] Don't default older GCC's to C++17, but C++14 or C++11 instead git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292607 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/libcxx/test/config.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index 0d9025826..ae48c735a 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -423,6 +423,15 @@ class Configuration(object): if not std: # Choose the newest possible language dialect if none is given. possible_stds = ['c++1z', 'c++14', 'c++11', 'c++03'] + if self.cxx.type == 'gcc': + maj_v, _, _ = self.cxx.version + maj_v = int(maj_v) + if maj_v < 7: + possible_stds.remove('c++1z') + # FIXME: How many C++14 tests actually fail under GCC 5 and 6? + # Should we XFAIL them individually instead? + if maj_v <= 6: + possible_stds.remove('c++14') for s in possible_stds: if self.cxx.hasCompileFlag('-std=%s' % s): std = s