Revert "Actually disable the module generation tests." #84527
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 0bbada9.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Eric (EricWF) ChangesThis reverts commit 0bbada9. Full diff: https://github.com/llvm/llvm-project/pull/84527.diff 2 Files Affected:
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
approved these changes
Mar 9, 2024
|
Why is it working again? |
The update of Clang in the CI broke due to the new LLVM version naming. It needs to look for the clang 18.1 package instead of 18. Since it couldn't find 18 it used 17 as fallback. This gives ODR violations which caused the output for the module test to be wrong. (It didn't crash which would be a lot more obvious to debug.) The clang-tidy selection was fixed by #81362. That patch also makes clang-19 work with clang-tidy-19 out of the box. The time-out have not been addressed; that is a CI issue and not an issue with this test. They run in 200-ish s so they are slow but far below the 1500s threshold. (Due to a dependency in this test it can't be split in multiple tests.) |
|
Ah OK. Thanks for the explanation. @EricWF could you put a shortened version into the commit message? |
nhasabni
pushed a commit
to nhasabni/llvm-project
that referenced
this pull request
May 9, 2024
This reverts commit 0bbada9. The update of Clang in the CI broke due to the new LLVM version naming. It needs to look for the clang 18.1 package instead of 18. Since it couldn't find 18 it used 17 as fallback. This gives ODR violations which caused the output for the module test to be wrong. (It didn't crash which would be a lot more obvious to debug.) The clang-tidy selection was fixed by llvm#81362. That patch also makes clang-19 work with clang-tidy-19 out of the box. The time-out have not been addressed; that is a CI issue and not an issue with this test. They run in 200-ish s so they are slow but far below the 1500s threshold. (Due to a dependency in this test it can't be split in multiple tests.)
nhasabni
pushed a commit
to nhasabni/llvm-project
that referenced
this pull request
May 9, 2024
This reverts commit 0bbada9. The update of Clang in the CI broke due to the new LLVM version naming. It needs to look for the clang 18.1 package instead of 18. Since it couldn't find 18 it used 17 as fallback. This gives ODR violations which caused the output for the module test to be wrong. (It didn't crash which would be a lot more obvious to debug.) The clang-tidy selection was fixed by llvm#81362. That patch also makes clang-19 work with clang-tidy-19 out of the box. The time-out have not been addressed; that is a CI issue and not an issue with this test. They run in 200-ish s so they are slow but far below the 1500s threshold. (Due to a dependency in this test it can't be split in multiple tests.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 0bbada9.
The update of Clang in the CI broke due to the new LLVM version naming. It needs to look for the clang 18.1 package instead of 18. Since it couldn't find 18 it used 17 as fallback. This gives ODR violations which caused the output for the module test to be wrong. (It didn't crash which would be a lot more obvious to debug.)
The clang-tidy selection was fixed by #81362. That patch also makes clang-19 work with clang-tidy-19 out of the box.
The time-out have not been addressed; that is a CI issue and not an issue with this test. They run in 200-ish s so they are slow but far below the 1500s threshold. (Due to a dependency in this test it can't be split in multiple tests.)