Skip to content

[libc++][CI] Reenables the module tests. #85799

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 1 commit into from
Mar 20, 2024

Conversation

mordante
Copy link
Member

These were disabled due to ODR violations with mixed versions of clang-tidy and the clang libraries. This issue was fixed in e19e860.

This reverts commit 0bbada9.

These were disabled due to ODR violations with mixed versions of
clang-tidy and the clang libraries. This issue was fixed in
e19e860.

This reverts commit 0bbada9.
@mordante mordante requested a review from a team as a code owner March 19, 2024 14:45
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Mar 19, 2024
@llvmbot
Copy link
Member

llvmbot commented Mar 19, 2024

@llvm/pr-subscribers-libcxx

Author: Mark de Wever (mordante)

Changes

These were disabled due to ODR violations with mixed versions of clang-tidy and the clang libraries. This issue was fixed in e19e860.

This reverts commit 0bbada9.


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

2 Files Affected:

  • (modified) libcxx/test/libcxx/module_std.gen.py (-5)
  • (modified) libcxx/test/libcxx/module_std_compat.gen.py (-5)
diff --git a/libcxx/test/libcxx/module_std.gen.py b/libcxx/test/libcxx/module_std.gen.py
index 5acaa837d37e0a..fc23985caf30de 100644
--- a/libcxx/test/libcxx/module_std.gen.py
+++ b/libcxx/test/libcxx/module_std.gen.py
@@ -16,11 +16,7 @@
 # to be one monolitic test. Since the test doesn't take very long it's
 # not a huge issue.
 
-# WARNING: Disabled at the bottom. Fix this test and remove the UNSUPPORTED line
-# TODO: Re-enable this test once we understand why it keeps timing out.
-
 # RUN: %{python} %s %{libcxx-dir}/utils
-# END.
 
 import sys
 
@@ -39,5 +35,4 @@
 
 
 print("//--- module_std.sh.cpp")
-print('// UNSUPPORTED: clang')
 generator.write_test("std")
diff --git a/libcxx/test/libcxx/module_std_compat.gen.py b/libcxx/test/libcxx/module_std_compat.gen.py
index a502276a1ccfc5..000aa299861220 100644
--- a/libcxx/test/libcxx/module_std_compat.gen.py
+++ b/libcxx/test/libcxx/module_std_compat.gen.py
@@ -16,11 +16,7 @@
 # to be one monolitic test. Since the test doesn't take very long it's
 # not a huge issue.
 
-# WARNING: Disabled at the bottom. Fix this test and remove the UNSUPPORTED line
-# TODO: Re-enable this test once we understand why it keeps timing out.
-
 # RUN: %{python} %s %{libcxx-dir}/utils
-# END.
 
 import sys
 
@@ -40,7 +36,6 @@
 
 
 print("//--- module_std_compat.sh.cpp")
-print("// UNSUPPORTED: clang")
 generator.write_test(
     "std.compat",
     module_c_headers,

@mordante mordante merged commit 22f2056 into llvm:main Mar 20, 2024
@mordante
Copy link
Member Author

Landed since the original commit was to avoid a build error that since then has been fixed.

@mordante mordante deleted the enables_module_tests branch March 20, 2024 10:33
chencha3 pushed a commit to chencha3/llvm-project that referenced this pull request Mar 23, 2024
These were disabled due to ODR violations with mixed versions of
clang-tidy and the clang libraries. This issue was fixed in
e19e860.

This reverts commit 0bbada9.
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.

2 participants