From: Petr Hosek Date: Thu, 9 Aug 2018 02:16:18 +0000 (+0000) Subject: [CMake] Use normalized Windows target triples X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9421b200959c22e3cbc8582ab6679e34a4dde54a;p=clang [CMake] Use normalized Windows target triples Changes the default Windows target triple returned by GetHostTriple.cmake from the old environment names (which we wanted to move away from) to newer, normalized ones. This also requires updating all tests to use the new systems names in constraints. Differential Revision: https://reviews.llvm.org/D47381 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339307 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/CodeGen/2007-06-18-SextAttrAggregate.c b/test/CodeGen/2007-06-18-SextAttrAggregate.c index e781bd5673..4bac5c61bc 100644 --- a/test/CodeGen/2007-06-18-SextAttrAggregate.c +++ b/test/CodeGen/2007-06-18-SextAttrAggregate.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 %s -o - -emit-llvm | FileCheck %s -// XFAIL: aarch64, arm64, x86_64-pc-win32, x86_64-w64-mingw32, x86_64-pc-windows-gnu +// XFAIL: aarch64, arm64, x86_64-pc-windows-msvc, x86_64-w64-windows-gnu, x86_64-pc-windows-gnu // PR1513 diff --git a/test/CodeGenCXX/vtable-debug-info.cpp b/test/CodeGenCXX/vtable-debug-info.cpp index 8710c76e0b..0ac90b3ec1 100644 --- a/test/CodeGenCXX/vtable-debug-info.cpp +++ b/test/CodeGenCXX/vtable-debug-info.cpp @@ -1,6 +1,6 @@ // RUN: %clang -emit-llvm -S -g %s -o /dev/null // Radar 8730409 -// XFAIL: win32 +// XFAIL: windows-msvc // FIXME: This test crashes on *-pc-win32 // for lack of debugging support on -integrated-as (MCCOFF). diff --git a/test/Driver/coverage_no_integrated_as.c b/test/Driver/coverage_no_integrated_as.c index 9acab9bbd1..d7689e591f 100644 --- a/test/Driver/coverage_no_integrated_as.c +++ b/test/Driver/coverage_no_integrated_as.c @@ -1,5 +1,5 @@ // REQUIRES: clang-driver -// XFAIL: win32,win64 +// XFAIL: windows-msvc // RUN: %clang -### -S -fprofile-arcs %s 2>&1 | FileCheck -check-prefix=CHECK-GCNO-DEFAULT-LOCATION %s // RUN: %clang -### -S -fprofile-arcs -no-integrated-as %s 2>&1 | FileCheck -check-prefix=CHECK-GCNO-DEFAULT-LOCATION %s diff --git a/test/Driver/crash-report-null.test b/test/Driver/crash-report-null.test index 477dd28df3..22c211ee98 100644 --- a/test/Driver/crash-report-null.test +++ b/test/Driver/crash-report-null.test @@ -1,7 +1,7 @@ // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH=1 %clang -fsyntax-only -x c /dev/null -lstdc++ 2>&1 | FileCheck %s // FIXME: Investigating. "fatal error: file 'nul' modified since it was first processed" -// XFAIL: mingw32 +// XFAIL: windows-gnu // CHECK: Preprocessed source(s) and associated run script(s) are located at: // CHECK-NEXT: note: diagnostic msg: {{.*}}null-{{.*}}.c diff --git a/test/Driver/inhibit-downstream-commands.c b/test/Driver/inhibit-downstream-commands.c index ceb245e4f1..43f4480a80 100644 --- a/test/Driver/inhibit-downstream-commands.c +++ b/test/Driver/inhibit-downstream-commands.c @@ -2,5 +2,5 @@ // CHECK: error: unknown type name 'invalid' // CHECK-NOT: clang: error: assembler command failed // CHECK-NOT: clang: error: linker command failed -// XFAIL: win32 +// XFAIL: windows-msvc invalid C code! diff --git a/test/Driver/linker-opts.c b/test/Driver/linker-opts.c index 5fe29d7a13..68b1e9fbe5 100644 --- a/test/Driver/linker-opts.c +++ b/test/Driver/linker-opts.c @@ -5,7 +5,7 @@ // CHECK: "-L{{.*}}/test1" // GCC driver is used as linker on cygming. It should be aware of LIBRARY_PATH. -// XFAIL: win32 +// XFAIL: windows-msvc // REQUIRES: clang-driver // REQUIRES: native diff --git a/test/Driver/no-integrated-as.s b/test/Driver/no-integrated-as.s index cd6f5e2867..bf6e69dd81 100644 --- a/test/Driver/no-integrated-as.s +++ b/test/Driver/no-integrated-as.s @@ -1,6 +1,6 @@ ; RUN: %clang -### -no-integrated-as -c %s 2>&1 | FileCheck %s -check-prefix IAS ; Windows doesn't support no-integrated-as -; XFAIL: win32,win64 +; XFAIL: windows-msvc ; ; Make sure the current file's filename appears in the output. ; We can't generically match on the assembler name, so we just make sure diff --git a/test/Lexer/cross-windows-on-linux.cpp b/test/Lexer/cross-windows-on-linux.cpp index 810e1d6ea9..c6dcbca540 100644 --- a/test/Lexer/cross-windows-on-linux.cpp +++ b/test/Lexer/cross-windows-on-linux.cpp @@ -8,7 +8,7 @@ // expected to fail on windows as the inclusion would succeed and the // compilation will fail due to the '#error success'. -// XFAIL: win32 +// XFAIL: windows-msvc // This test may or may not fail since 'Inputs\success.h' is passed // to Win32 APIs on Windows. diff --git a/test/Modules/crash-vfs-path-emptydir-entries.m b/test/Modules/crash-vfs-path-emptydir-entries.m index a50ea869f4..0c7286d248 100644 --- a/test/Modules/crash-vfs-path-emptydir-entries.m +++ b/test/Modules/crash-vfs-path-emptydir-entries.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // Test clang can collect symbolic link headers used in modules. // crash reproducer if there's a symbolic link header file used in a module. diff --git a/test/Modules/crash-vfs-path-symlink-component.m b/test/Modules/crash-vfs-path-symlink-component.m index 565a64fb5c..b868625aa6 100644 --- a/test/Modules/crash-vfs-path-symlink-component.m +++ b/test/Modules/crash-vfs-path-symlink-component.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // Test that clang is capable of collecting the right header files in the // crash reproducer if there's a symbolic link component in the path. diff --git a/test/Modules/crash-vfs-path-symlink-topheader.m b/test/Modules/crash-vfs-path-symlink-topheader.m index fea1f01c02..6582243d62 100644 --- a/test/Modules/crash-vfs-path-symlink-topheader.m +++ b/test/Modules/crash-vfs-path-symlink-topheader.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // Test clang can collect symbolic link headers used in modules. // crash reproducer if there's a symbolic link header file used in a module. diff --git a/test/Modules/crash-vfs-path-traversal.m b/test/Modules/crash-vfs-path-traversal.m index cd12cadcf1..b924d81d04 100644 --- a/test/Modules/crash-vfs-path-traversal.m +++ b/test/Modules/crash-vfs-path-traversal.m @@ -3,7 +3,7 @@ // FIXME: Canonicalizing paths to remove relative traversal components // currenty fails a unittest on windows and is disable by default. // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // RUN: rm -rf %t // RUN: mkdir -p %t/i %t/m %t diff --git a/test/Modules/crash-vfs-relative-overlay.m b/test/Modules/crash-vfs-relative-overlay.m index e55f4c8f27..9eeed011fc 100644 --- a/test/Modules/crash-vfs-relative-overlay.m +++ b/test/Modules/crash-vfs-relative-overlay.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // RUN: rm -rf %t // RUN: mkdir -p %t/i %t/m %t diff --git a/test/Modules/crash-vfs-umbrella-frameworks.m b/test/Modules/crash-vfs-umbrella-frameworks.m index a18acf576e..e311c60854 100644 --- a/test/Modules/crash-vfs-umbrella-frameworks.m +++ b/test/Modules/crash-vfs-umbrella-frameworks.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // RUN: rm -rf %t // RUN: mkdir -p %t/i %t/m %t diff --git a/test/SemaTemplate/instantiation-depth-default.cpp b/test/SemaTemplate/instantiation-depth-default.cpp index 3d89aa18ca..69efa253e3 100644 --- a/test/SemaTemplate/instantiation-depth-default.cpp +++ b/test/SemaTemplate/instantiation-depth-default.cpp @@ -14,4 +14,4 @@ template struct X : X {}; X<0, int> x; // expected-note {{in instantiation of}} // FIXME: It crashes. Investigating. -// UNSUPPORTED: mingw32 +// UNSUPPORTED: windows-gnu diff --git a/test/VFS/umbrella-framework-import-skipnonexist.m b/test/VFS/umbrella-framework-import-skipnonexist.m index 129f475fe7..2f148cee7e 100644 --- a/test/VFS/umbrella-framework-import-skipnonexist.m +++ b/test/VFS/umbrella-framework-import-skipnonexist.m @@ -1,7 +1,7 @@ // REQUIRES: crash-recovery, shell // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows-gnu // RUN: rm -rf %t // RUN: mkdir -p %t/vdir %t/outdir %t/cache diff --git a/test/lit.cfg.py b/test/lit.cfg.py index c962b41723..39b5586612 100644 --- a/test/lit.cfg.py +++ b/test/lit.cfg.py @@ -137,7 +137,7 @@ if os.path.exists('/dev/fd/0') and sys.platform not in ['cygwin']: config.available_features.add('dev-fd-fs') # Not set on native MS environment. -if not re.match(r'.*-win32$', config.target_triple): +if not re.match(r'.*-(windows-msvc)$', config.target_triple): config.available_features.add('non-ms-sdk') # Not set on native PS4 environment. @@ -145,7 +145,7 @@ if not re.match(r'.*-scei-ps4', config.target_triple): config.available_features.add('non-ps4-sdk') # [PR8833] LLP64-incompatible tests -if not re.match(r'^x86_64.*-(win32|mingw32|windows-gnu)$', config.target_triple): +if not re.match(r'^x86_64.*-(windows-msvc|windows-gnu)$', config.target_triple): config.available_features.add('LP64') # [PR12920] "clang-driver" -- set if gcc driver is not used.