[compiler-rt] r339307 - [CMake] Use normalized Windows target triples

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 8 19:16:19 PDT 2018


Author: phosek
Date: Wed Aug  8 19:16:18 2018
New Revision: 339307

URL: http://llvm.org/viewvc/llvm-project?rev=339307&view=rev
Log:
[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

Modified:
    compiler-rt/trunk/test/asan/TestCases/Posix/mmap_limit_mb.cc
    compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
    compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test2.cc
    compiler-rt/trunk/test/asan/TestCases/asan_and_llvm_coverage_test.cc
    compiler-rt/trunk/test/asan/TestCases/atoll_strict.c
    compiler-rt/trunk/test/asan/TestCases/heavy_uar_test.cc
    compiler-rt/trunk/test/asan/TestCases/initialization-bug.cc
    compiler-rt/trunk/test/asan/TestCases/intra-object-overflow.cc
    compiler-rt/trunk/test/asan/TestCases/log-path_test.cc
    compiler-rt/trunk/test/asan/TestCases/pass-object-byval.cc
    compiler-rt/trunk/test/asan/TestCases/printf-2.c
    compiler-rt/trunk/test/asan/TestCases/printf-3.c
    compiler-rt/trunk/test/asan/TestCases/printf-4.c
    compiler-rt/trunk/test/asan/TestCases/printf-5.c
    compiler-rt/trunk/test/asan/TestCases/printf-m.c
    compiler-rt/trunk/test/asan/TestCases/set_shadow_test.c
    compiler-rt/trunk/test/asan/TestCases/strcasestr-1.c
    compiler-rt/trunk/test/asan/TestCases/strcasestr-2.c
    compiler-rt/trunk/test/asan/TestCases/strcasestr_strict.c
    compiler-rt/trunk/test/asan/TestCases/strcat-overlap.cc
    compiler-rt/trunk/test/asan/TestCases/strncasecmp_strict.c
    compiler-rt/trunk/test/asan/TestCases/strtoll_strict.c
    compiler-rt/trunk/test/asan/TestCases/suppressions-exec-relative-location.cc
    compiler-rt/trunk/test/asan/TestCases/suppressions-function.cc
    compiler-rt/trunk/test/asan/TestCases/time_interceptor.cc
    compiler-rt/trunk/test/asan/TestCases/verbose-log-path_test.cc
    compiler-rt/trunk/test/cfi/bad-split.cpp
    compiler-rt/trunk/test/cfi/cross-dso-diagnostic.cpp
    compiler-rt/trunk/test/cfi/mfcall.cpp
    compiler-rt/trunk/test/cfi/target_uninstrumented.cpp
    compiler-rt/trunk/test/cfi/two-vcalls.cpp
    compiler-rt/trunk/test/msan/strndup.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/allocator_returns_null.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/malloc_hook.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/strcasestr.c
    compiler-rt/trunk/test/ubsan/TestCases/Misc/enum.cpp
    compiler-rt/trunk/test/ubsan/TestCases/Misc/log-path_test.cc
    compiler-rt/trunk/test/ubsan/TestCases/Misc/monitor.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/Function/function.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/PR33221.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp
    compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr.cpp

Modified: compiler-rt/trunk/test/asan/TestCases/Posix/mmap_limit_mb.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/mmap_limit_mb.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/mmap_limit_mb.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/mmap_limit_mb.cc Wed Aug  8 19:16:18 2018
@@ -9,7 +9,7 @@
 // RUN: %env_asan_opts=mmap_limit_mb=300 not %run %t 500 1000000 2>&1 | FileCheck %s
 //
 // FIXME: Windows doesn't implement mmap_limit_mb.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc Wed Aug  8 19:16:18 2018
@@ -7,7 +7,7 @@
 // RUN: %clangxx_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 // Unwind problem on arm: "main" is missing from the allocation stack trace.
-// UNSUPPORTED: win32,s390,arm && !fast-unwinder-works
+// UNSUPPORTED: windows-msvc,s390,arm && !fast-unwinder-works
 
 #include <string.h>
 

Modified: compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test2.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test2.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test2.cc Wed Aug  8 19:16:18 2018
@@ -7,7 +7,7 @@
 // RUN: %clang_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 // Unwind problem on arm: "main" is missing from the allocation stack trace.
-// UNSUPPORTED: win32,s390,arm && !fast-unwinder-works
+// UNSUPPORTED: windows-msvc,s390,arm && !fast-unwinder-works
 
 #include <string.h>
 

Modified: compiler-rt/trunk/test/asan/TestCases/asan_and_llvm_coverage_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/asan_and_llvm_coverage_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/asan_and_llvm_coverage_test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/asan_and_llvm_coverage_test.cc Wed Aug  8 19:16:18 2018
@@ -2,7 +2,7 @@
 // RUN: %env_asan_opts=check_initialization_order=1 %run %t 2>&1 | FileCheck %s
 
 // We don't really support running tests using profile runtime on Windows.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 #include <stdio.h>
 int foo() { return 1; }
 int XXX = foo();

Modified: compiler-rt/trunk/test/asan/TestCases/atoll_strict.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/atoll_strict.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/atoll_strict.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/atoll_strict.c Wed Aug  8 19:16:18 2018
@@ -11,7 +11,7 @@
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t test3 2>&1 | FileCheck %s --check-prefix=CHECK3
 
 // FIXME: Needs Windows interceptor.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/heavy_uar_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/heavy_uar_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/heavy_uar_test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/heavy_uar_test.cc Wed Aug  8 19:16:18 2018
@@ -1,6 +1,6 @@
 // RUN: %clangxx_asan -O0 %s -o %t && %env_asan_opts=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -O2 %s -o %t && %env_asan_opts=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 // FIXME: Fix this test under GCC.
 // REQUIRES: Clang

Modified: compiler-rt/trunk/test/asan/TestCases/initialization-bug.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/initialization-bug.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/initialization-bug.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/initialization-bug.cc Wed Aug  8 19:16:18 2018
@@ -6,7 +6,7 @@
 // Do not test with optimization -- the error may be optimized away.
 
 // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=186
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 // The test is expected to fail on OS X Yosemite and older
 // UNSUPPORTED: osx-no-ld64-live_support

Modified: compiler-rt/trunk/test/asan/TestCases/intra-object-overflow.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/intra-object-overflow.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/intra-object-overflow.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/intra-object-overflow.cc Wed Aug  8 19:16:18 2018
@@ -5,7 +5,7 @@
 // FIXME: fix 32-bits.
 // REQUIRES: asan-64-bits, shadow-scale-3
 // FIXME: Implement ASan intra-object padding in Clang's MS record layout
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 #include <stdio.h>
 #include <stdlib.h>
 class Foo {

Modified: compiler-rt/trunk/test/asan/TestCases/log-path_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/log-path_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/log-path_test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/log-path_test.cc Wed Aug  8 19:16:18 2018
@@ -31,7 +31,7 @@
 // RUN: not cat %t.log.*
 
 // FIXME: log_path is not supported on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdlib.h>
 #include <string.h>

Modified: compiler-rt/trunk/test/asan/TestCases/pass-object-byval.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/pass-object-byval.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/pass-object-byval.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/pass-object-byval.cc Wed Aug  8 19:16:18 2018
@@ -5,7 +5,7 @@
 // RUN:     Assertion{{.*}}failed
 
 // ASan instrumentation can't insert red-zones around inalloca parameters.
-// XFAIL: win32 && asan-32-bits
+// XFAIL: windows-msvc && asan-32-bits
 
 #include <cassert>
 

Modified: compiler-rt/trunk/test/asan/TestCases/printf-2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/printf-2.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/printf-2.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/printf-2.c Wed Aug  8 19:16:18 2018
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=replace_str=0:intercept_strlen=0:replace_intrin=0 not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/printf-3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/printf-3.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/printf-3.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/printf-3.c Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 int main() {

Modified: compiler-rt/trunk/test/asan/TestCases/printf-4.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/printf-4.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/printf-4.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/printf-4.c Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 
 // FIXME: sprintf is not intercepted on Windows yet. But this test can
 // pass if sprintf calls memmove, which is intercepted, so we can't XFAIL it.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 int main() {

Modified: compiler-rt/trunk/test/asan/TestCases/printf-5.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/printf-5.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/printf-5.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/printf-5.c Wed Aug  8 19:16:18 2018
@@ -5,7 +5,7 @@
 // RUN: %env_asan_opts=replace_intrin=0 not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <string.h>

Modified: compiler-rt/trunk/test/asan/TestCases/printf-m.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/printf-m.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/printf-m.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/printf-m.c Wed Aug  8 19:16:18 2018
@@ -1,7 +1,7 @@
 // RUN: %clang_asan -O2 %s -o %t && %run %t
 
 // FIXME: printf is not intercepted on Windows yet.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 

Modified: compiler-rt/trunk/test/asan/TestCases/set_shadow_test.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/set_shadow_test.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/set_shadow_test.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/set_shadow_test.c Wed Aug  8 19:16:18 2018
@@ -6,7 +6,7 @@
 // RUN: not %run %t 0xf5 2>&1 | FileCheck %s -check-prefix=XF5
 // RUN: not %run %t 0xf8 2>&1 | FileCheck %s -check-prefix=XF8
 
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <sanitizer/asan_interface.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strcasestr-1.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcasestr-1.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strcasestr-1.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/strcasestr-1.c Wed Aug  8 19:16:18 2018
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=intercept_strstr=false:replace_str=false %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strcasestr-2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcasestr-2.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strcasestr-2.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/strcasestr-2.c Wed Aug  8 19:16:18 2018
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=intercept_strstr=false:replace_str=false:intercept_strlen=false %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strcasestr_strict.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcasestr_strict.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strcasestr_strict.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/strcasestr_strict.c Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t 2>&1 | FileCheck %s
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strcat-overlap.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcat-overlap.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strcat-overlap.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/strcat-overlap.cc Wed Aug  8 19:16:18 2018
@@ -31,7 +31,7 @@
 // depending on how strcat() is implemented. For now only run
 // on platforms where we know the test passes.
 // REQUIRES: x86_64h-darwin || x86_64-darwin || i386-darwin || x86_64-linux || i386-linux
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // UNSUPPORTED: android
 
 #include <string.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strncasecmp_strict.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strncasecmp_strict.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strncasecmp_strict.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/strncasecmp_strict.c Wed Aug  8 19:16:18 2018
@@ -14,7 +14,7 @@
 // RUN: %env_asan_opts=strict_string_checks=false %run %t i 2>&1
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t i 2>&1 | FileCheck %s
 
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/strtoll_strict.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strtoll_strict.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/strtoll_strict.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/strtoll_strict.c Wed Aug  8 19:16:18 2018
@@ -24,7 +24,7 @@
 
 // FIXME: Enable strtoll interceptor.
 // REQUIRES: shadow-scale-3
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/suppressions-exec-relative-location.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/suppressions-exec-relative-location.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/suppressions-exec-relative-location.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/suppressions-exec-relative-location.cc Wed Aug  8 19:16:18 2018
@@ -24,7 +24,7 @@
 // RUN:   FileCheck --check-prefix=CHECK-WRONG-FILE-NAME %s
 
 // XFAIL: android
-// XFAIL: win32
+// XFAIL: windows-msvc
 // UNSUPPORTED: ios
 
 #include <stdio.h>

Modified: compiler-rt/trunk/test/asan/TestCases/suppressions-function.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/suppressions-function.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/suppressions-function.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/suppressions-function.cc Wed Aug  8 19:16:18 2018
@@ -7,7 +7,7 @@
 // RUN: %clangxx_asan -O3 %s -o %t && %env_asan_opts=suppressions='"%t.supp"' %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
 
 // FIXME: Windows symbolizer needs work to make this pass.
-// XFAIL: android,win32
+// XFAIL: android,windows-msvc
 // UNSUPPORTED: ios
 
 // FIXME: atos does not work for inlined functions, yet llvm-symbolizer

Modified: compiler-rt/trunk/test/asan/TestCases/time_interceptor.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/time_interceptor.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/time_interceptor.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/time_interceptor.cc Wed Aug  8 19:16:18 2018
@@ -3,7 +3,7 @@
 // Test the time() interceptor.
 
 // There's no interceptor for time() on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/asan/TestCases/verbose-log-path_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/verbose-log-path_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/verbose-log-path_test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/verbose-log-path_test.cc Wed Aug  8 19:16:18 2018
@@ -10,7 +10,7 @@
 // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %t-dir/asan.log.verbose-log-path_test-binary.*
 
 // FIXME: only FreeBSD, NetBSD and Linux have verbose log paths now.
-// XFAIL: win32,android
+// XFAIL: windows-msvc,android
 // UNSUPPORTED: ios
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/cfi/bad-split.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/bad-split.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/bad-split.cpp (original)
+++ compiler-rt/trunk/test/cfi/bad-split.cpp Wed Aug  8 19:16:18 2018
@@ -1,7 +1,7 @@
 // GlobalSplit used to lose type metadata for classes with virtual bases but no virtual methods.
 // RUN: %clangxx_cfi -o %t1 %s && %run %t1
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct Z {
 };

Modified: compiler-rt/trunk/test/cfi/cross-dso-diagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/cross-dso-diagnostic.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/cross-dso-diagnostic.cpp (original)
+++ compiler-rt/trunk/test/cfi/cross-dso-diagnostic.cpp Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // RUN: %clangxx_cfi_diag -g -o %t_exe_suffix %s %ld_flags_rpath_exe
 // RUN: %t_exe_suffix 2>&1 | FileCheck -DDSONAME=%xdynamiclib_namespec %s
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: cxxabi
 
 #include <dlfcn.h>

Modified: compiler-rt/trunk/test/cfi/mfcall.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/mfcall.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/mfcall.cpp (original)
+++ compiler-rt/trunk/test/cfi/mfcall.cpp Wed Aug  8 19:16:18 2018
@@ -1,4 +1,4 @@
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 // RUN: %clangxx_cfi -o %t %s
 // RUN: %expect_crash %run %t a

Modified: compiler-rt/trunk/test/cfi/target_uninstrumented.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/target_uninstrumented.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/target_uninstrumented.cpp (original)
+++ compiler-rt/trunk/test/cfi/target_uninstrumented.cpp Wed Aug  8 19:16:18 2018
@@ -3,7 +3,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 #include <string.h>

Modified: compiler-rt/trunk/test/cfi/two-vcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/two-vcalls.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/two-vcalls.cpp (original)
+++ compiler-rt/trunk/test/cfi/two-vcalls.cpp Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // This test checks that we don't generate two type checks,
 // if two virtual calls are in the same function.
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: cxxabi
 
 // TODO(krasin): implement the optimization to not emit two type checks.

Modified: compiler-rt/trunk/test/msan/strndup.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/strndup.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/strndup.cc (original)
+++ compiler-rt/trunk/test/msan/strndup.cc Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // When built as C on Linux, strndup is transformed to __strndup.
 // RUN: %clangxx_msan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck --check-prefix=ON %s
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/allocator_returns_null.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/allocator_returns_null.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/allocator_returns_null.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/allocator_returns_null.cc Wed Aug  8 19:16:18 2018
@@ -36,7 +36,7 @@
 // RUN:   | FileCheck %s --check-prefix=CHECK-NULL
 
 // TODO(alekseyshl): win32 is disabled due to failing errno tests, fix it there.
-// UNSUPPORTED: ubsan, win32
+// UNSUPPORTED: ubsan, windows-msvc
 
 #include <assert.h>
 #include <errno.h>

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/malloc_hook.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/malloc_hook.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/malloc_hook.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/malloc_hook.cc Wed Aug  8 19:16:18 2018
@@ -1,7 +1,7 @@
 // RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Malloc/free hooks are not supported on Windows.
-// XFAIL: win32
+// XFAIL: windows-msvc
 // XFAIL: ubsan
 
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/strcasestr.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/strcasestr.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/strcasestr.c (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/strcasestr.c Wed Aug  8 19:16:18 2018
@@ -1,7 +1,7 @@
 // RUN: %clang %s -o %t && %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>

Modified: compiler-rt/trunk/test/ubsan/TestCases/Misc/enum.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/Misc/enum.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/Misc/enum.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/Misc/enum.cpp Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 
 // FIXME: UBSan fails to add the correct instrumentation code for some reason on
 // Windows.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 enum E { a = 1 } e;
 #undef E

Modified: compiler-rt/trunk/test/ubsan/TestCases/Misc/log-path_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/Misc/log-path_test.cc?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/Misc/log-path_test.cc (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/Misc/log-path_test.cc Wed Aug  8 19:16:18 2018
@@ -21,7 +21,7 @@
 // RUN: not cat %t.log.*
 
 // FIXME: log_path is not supported on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: compiler-rt/trunk/test/ubsan/TestCases/Misc/monitor.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/Misc/monitor.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/Misc/monitor.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/Misc/monitor.cpp Wed Aug  8 19:16:18 2018
@@ -4,7 +4,7 @@
 // __ubsan_on_report is not defined as weak. Redefining it here isn't supported
 // on Windows.
 //
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // Linkage issue
 // XFAIL: openbsd
 

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/Function/function.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/Function/function.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/Function/function.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/Function/function.cpp Wed Aug  8 19:16:18 2018
@@ -2,7 +2,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 // Verify that we can disable symbolization if needed:
 // RUN: %env_ubsan_opts=symbolize=0 %run %t 2>&1 | FileCheck %s --check-prefix=NOSYM
-// XFAIL: win32,win64
+// XFAIL: windows-msvc
 // Unsupported function flag
 // UNSUPPORTED: openbsd
 

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/PR33221.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/PR33221.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/PR33221.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/PR33221.cpp Wed Aug  8 19:16:18 2018
@@ -2,7 +2,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <string.h>
 

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp Wed Aug  8 19:16:18 2018
@@ -1,7 +1,7 @@
 // RUN: %clangxx -frtti -fsanitize=vptr -fno-sanitize-recover=vptr,null -g %s -O3 -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-CORRUPTED-VTABLE --strict-whitespace
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: stable-runtime, cxxabi
 #include <cstddef>
 

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp Wed Aug  8 19:16:18 2018
@@ -3,7 +3,7 @@
 // RUN: %run %t
 //
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct X {
   virtual ~X() {}

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp Wed Aug  8 19:16:18 2018
@@ -2,7 +2,7 @@
 // RUN: %run %t
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 int volatile n;
 

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp Wed Aug  8 19:16:18 2018
@@ -2,7 +2,7 @@
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct S { virtual int f() { return 0; } };
 struct T : virtual S {};

Modified: compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr.cpp (original)
+++ compiler-rt/trunk/test/ubsan/TestCases/TypeCheck/vptr.cpp Wed Aug  8 19:16:18 2018
@@ -37,7 +37,7 @@
 // RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.loc-supp"' not %run %t x- 2>&1 | FileCheck %s --check-prefix=CHECK-LOC-SUPPRESS
 
 // REQUIRES: stable-runtime, cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // Suppressions file not pushed to the device.
 // UNSUPPORTED: android
 // Compilation error




More information about the llvm-commits mailing list