diff options
Diffstat (limited to 'test/libcxx')
| -rw-r--r-- | test/libcxx/test/config.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index 5fcb8f4a9b3f..3d790249ce66 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -403,6 +403,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 |