Skip to content

[libc++] Mark local_time test as a long test #95170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2024

Conversation

ldionne
Copy link
Member

@ldionne ldionne commented Jun 11, 2024

It can otherwise timeout under some slow configurations.

@ldionne ldionne requested a review from a team as a code owner June 11, 2024 20:54
@ldionne
Copy link
Member Author

ldionne commented Jun 11, 2024

@vitalybuka Where is the CMake cache that you use for your hwasan bot? It needs to be updated similarly.

Copy link
Member

@mordante mordante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this! LGTM modulo one request.

@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Jun 12, 2024
@ldionne
Copy link
Member Author

ldionne commented Jun 12, 2024

@vitalybuka If we check this in without also updating your bot configuration, it'll break again since we're removing the UNSUPPORTED: hwasan annotation in the test.

@llvmbot
Copy link
Member

llvmbot commented Jun 12, 2024

@llvm/pr-subscribers-libcxx

Author: Louis Dionne (ldionne)

Changes

It can otherwise timeout under some slow configurations.


Full diff: https://github.com/llvm/llvm-project/pull/95170.diff

3 Files Affected:

  • (modified) libcxx/cmake/caches/Generic-msan.cmake (+2)
  • (modified) libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp (+1-2)
  • (modified) libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/sys_info.zdump.pass.cpp (+1)
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
 
 // <chrono>
 
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

@vitalybuka
Copy link
Collaborator

I have enabled the flag on our build bots, so it's safe to land.

ldionne added 2 commits June 12, 2024 10:27
It can otherwise timeout under some slow configurations.
@vitalybuka vitalybuka force-pushed the review/sanitizers-long-tests branch from 4e2bdd2 to 8202a5e Compare June 12, 2024 17:27
@vitalybuka
Copy link
Collaborator

@vitalybuka vitalybuka force-pushed the review/sanitizers-long-tests branch from 4e2bdd2 to 8202a5e

It was rebase just to trigger CI, as many steps failed.

@ldionne ldionne merged commit 148417b into llvm:main Jun 12, 2024
52 of 55 checks passed
@ldionne ldionne deleted the review/sanitizers-long-tests branch June 12, 2024 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants