[libcxx-commits] [libcxx] d7915c8 - [libc++][test] Fixes using modules in the test suite.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2023-07-31T18:36:45+02:00
New Revision: d7915c8aa95010302bd98429e14bb7c50252344f

URL: https://github.com/llvm/llvm-project/commit/d7915c8aa95010302bd98429e14bb7c50252344f
DIFF: https://github.com/llvm/llvm-project/commit/d7915c8aa95010302bd98429e14bb7c50252344f.diff

LOG: [libc++][test] Fixes using modules in the test suite.

Importing modules in the test suite failed due to linker errors. This
fixes the issue and adds a minimal test to validate importing the std
module works.

Reviewed By: #libc, philnik

Differential Revision: https://reviews.llvm.org/D156550

Added: 
    libcxx/test/std/modules/std.pass.cpp

Modified: 
    libcxx/utils/libcxx/test/dsl.py

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/modules/std.pass.cpp b/libcxx/test/std/modules/std.pass.cpp
new file mode 100644
index 00000000000000..441bff12eeb227
--- /dev/null
+++ b/libcxx/test/std/modules/std.pass.cpp
@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTEd: c++03, c++11, c++14, c++17, c++20
+// TODO MODULES fix c++26
+// XFAIL: c++26
+
+// REQUIRES: use_module_std
+
+// A minimal test to validate import works.
+
+import std;
+
+int main(int, char**) {
+  std::println("Hello modular world");
+  return 0;
+}

diff  --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py
index 77a709655cb713..29ec53a3305ead 100644
--- a/libcxx/utils/libcxx/test/dsl.py
+++ b/libcxx/utils/libcxx/test/dsl.py
@@ -456,8 +456,12 @@ def applyTo(self, config):
     flags = _getSubstitution('%{flags}', config)
     cmake = _getSubstitution('%{cmake}', config)
 
-    subprocess.check_call([cmake, "-DCMAKE_CXX_STANDARD=" + std, f"-DCMAKE_CXX_FLAGS={flags}", build], env={})
-    subprocess.check_call([cmake, "--build", build], env={})
+    subprocess.check_call([cmake, f"-DCMAKE_CXX_STANDARD={std}", f"-DCMAKE_CXX_FLAGS={flags}", build], env={})
+    subprocess.check_call([cmake, "--build", build, "--", "-v"], env={})
+    config.substitutions = _appendToSubstitution(
+       # TODO MODULES Avoid manually modifying link_flags.
+       config.substitutions, "%{link_flags}",  os.path.join(build, "libc++std.a")
+    )
 
   def pretty(self, config, litParams):
     return "building std module with flags {}".format(_getSubstitution('%{flags}', config))