[llvm-branch-commits] [libcxx] [libc++] Cherry-pick the disabling of modules tests onto release/18.x (PR #85247)

[Louis Dionne via llvm-branch-commits]

https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/85247

LIT was never really meant to generate tests during discovery, and we probably shouldn't be doing this.

This hack is even worse than the initial attempt because it buries the "UNSUPPORTED" at the bottom of the test.

Fixes #85242

>From 00f76b0f1cc512013fc942de9f0cfed129e5c914 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric at efcs.ca>
Date: Fri, 8 Mar 2024 12:17:07 -0500
Subject: [PATCH] Actually disable the module generation tests.

LIT was never really meant to generate tests during discovery,
and we probably shouldn't be doing this.

This hack is even worse than the initial attempt because it buries the
"UNSUPPORTED" at the bottom of the test.
---
 libcxx/test/libcxx/module_std.gen.py        | 5 +++++
 libcxx/test/libcxx/module_std_compat.gen.py | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libcxx/test/libcxx/module_std.gen.py b/libcxx/test/libcxx/module_std.gen.py
index a9a05a0cd74e61..3bc6ddbd882031 100644
--- a/libcxx/test/libcxx/module_std.gen.py
+++ b/libcxx/test/libcxx/module_std.gen.py
@@ -16,7 +16,11 @@
 # 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}/utils
+# END.
 
 import sys
 
@@ -35,4 +39,5 @@
 
 
 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 270d131779e5bf..c1e74eb379c8ab 100644
--- a/libcxx/test/libcxx/module_std_compat.gen.py
+++ b/libcxx/test/libcxx/module_std_compat.gen.py
@@ -16,7 +16,11 @@
 # 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}/utils
+# END.
 
 import sys
 
@@ -36,6 +40,7 @@
 
 
 print("//--- module_std_compat.sh.cpp")
+print("// UNSUPPORTED: clang")
 generator.write_test(
     "std.compat",
     module_c_headers,