From 11762b4acd1fc19fb8f6d0015b339ad6b9c8f2f5 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Fri, 8 Sep 2017 03:57:02 +0000 Subject: [PATCH] XFAIL tests on SLES11 XFAIL some failing tests for SLES11 (older glibc), also replace spaces in linux distro w/dashes. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@312774 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/std/depr/depr.c.headers/uchar_h.pass.cpp | 1 + .../syserr.errcat.objects/generic_category.pass.cpp | 1 + .../syserr.errcat.objects/system_category.pass.cpp | 1 + utils/libcxx/test/target_info.py | 6 ++++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/std/depr/depr.c.headers/uchar_h.pass.cpp b/test/std/depr/depr.c.headers/uchar_h.pass.cpp index f5f69f8e5..f12169845 100644 --- a/test/std/depr/depr.c.headers/uchar_h.pass.cpp +++ b/test/std/depr/depr.c.headers/uchar_h.pass.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// // +// XFAIL: suse-linux-enterprise-server-11 // XFAIL: apple-darwin // XFAIL: newlib diff --git a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp index 0783de85c..cd76a9f5e 100644 --- a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp +++ b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +// XFAIL: suse-linux-enterprise-server-11 // XFAIL: with_system_cxx_lib=macosx10.12 // XFAIL: with_system_cxx_lib=macosx10.11 // XFAIL: with_system_cxx_lib=macosx10.10 diff --git a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp index 8cccb0255..c9c6d52e2 100644 --- a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp +++ b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp @@ -13,6 +13,7 @@ // const error_category& system_category(); +// XFAIL: suse-linux-enterprise-server-11 // XFAIL: with_system_cxx_lib=macosx10.12 // XFAIL: with_system_cxx_lib=macosx10.11 // XFAIL: with_system_cxx_lib=macosx10.10 diff --git a/utils/libcxx/test/target_info.py b/utils/libcxx/test/target_info.py index e6fde900c..670aea7ae 100644 --- a/utils/libcxx/test/target_info.py +++ b/utils/libcxx/test/target_info.py @@ -190,12 +190,14 @@ class LinuxLocalTI(DefaultTargetInfo): def platform_name(self): name, _, _ = platform.linux_distribution() - name = name.lower().strip() + # Some distros have spaces, e.g. 'SUSE Linux Enterprise Server' + # lit features can't have spaces + name = name.lower().strip().replace(' ', '-') return name # Permitted to be None def platform_ver(self): _, ver, _ = platform.linux_distribution() - ver = ver.lower().strip() + ver = ver.lower().strip().replace(' ', '-') return ver # Permitted to be None. def add_locale_features(self, features):