From da2f04d5746ab5602c56492f187bc07602e90c39 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 11 Jun 2024 16:53:45 -0400 Subject: [PATCH 1/2] [libc++] Mark local_time test as a long test It can otherwise timeout under some slow configurations. --- libcxx/cmake/caches/Generic-msan.cmake | 2 ++ .../time.zone.members/get_info.local_time.pass.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libcxx/cmake/caches/Generic-msan.cmake b/libcxx/cmake/caches/Generic-msan.cmake index 9e50255fe4ff6..a8fbd285a9adf 100644 --- a/libcxx/cmake/caches/Generic-msan.cmake +++ b/libcxx/cmake/caches/Generic-msan.cmake @@ -1,2 +1,4 @@ set(LLVM_USE_SANITIZER "MemoryWithOrigins" CACHE STRING "") +set(LIBCXX_TEST_PARAMS "long_tests=False" CACHE STRING "") # MSAN is really slow and tests can sometimes timeout otherwise +set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "") set(LIBCXXABI_USE_LLVM_UNWINDER OFF CACHE BOOL "") # MSAN is compiled against the system unwinder, which leads to false positives diff --git a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp index ec3e490c0ed79..d424b41673b14 100644 --- a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp +++ b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp @@ -8,11 +8,10 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: no-filesystem, no-localization, no-tzdb +// REQUIRES: long_tests // XFAIL: libcpp-has-no-experimental-tzdb // XFAIL: availability-tzdb-missing -// Times out under HWASan -// UNSUPPORTED: hwasan // From 8202a5e664a44314d3c12fcedfb30345c268fa4d Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 12 Jun 2024 11:51:54 -0400 Subject: [PATCH 2/2] Add zdump to long tests --- .../time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp index 50b7bdb568d43..207f8e4df4541 100644 --- a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp +++ b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp @@ -8,6 +8,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: no-filesystem, no-localization, no-tzdb, has-no-zdump +// REQUIRES: long_tests // XFAIL: libcpp-has-no-experimental-tzdb // XFAIL: availability-tzdb-missing