[libcxx-commits] [PATCH] D153408: [libc++][CI] Test std module in C++26 mode.

[Mark de Wever via Phabricator via libcxx-commits]

Mordante created this revision.
Herald added a subscriber: arichardson.
Herald added a project: All.
Mordante requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D153408

Files:
  libcxx/cmake/caches/Generic-module-std-cxx26.cmake
  libcxx/utils/ci/buildkite-pipeline.yml
  libcxx/utils/ci/run-buildbot
  libcxx/utils/libcxx/test/dsl.py


Index: libcxx/utils/libcxx/test/dsl.py
===================================================================
--- libcxx/utils/libcxx/test/dsl.py
+++ libcxx/utils/libcxx/test/dsl.py
@@ -443,11 +443,7 @@
 
     std = _getSubstitution('%{cxx_std}', config)
     if std == 'cxx26':
-        # This fails to work properly. It might be due to
-        #   CMAKE_CXX_STANDARD 26
-        # does not work in CMake 3.26, it requires the upcomming CMake 3.27.
-        # TODO MODULES test whether this is fixed with CMake 3.27.
-        std = '17'
+        std = '26'
     elif std == 'cxx23':
         std = '23'
     else:
Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -419,6 +419,12 @@
     check-runtimes
     check-abi-list
 ;;
+generic-module-std-cxx26)
+    clean
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-module-std-cxx26.cmake"
+    check-runtimes
+    check-abi-list
+;;
 #
 # Parts removed
 #
Index: libcxx/utils/ci/buildkite-pipeline.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline.yml
+++ libcxx/utils/ci/buildkite-pipeline.yml
@@ -146,8 +146,8 @@
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "C++23 Module std"
-    command: "libcxx/utils/ci/run-buildbot generic-module-std-cxx23"
+  - label: "C++26 Module std"
+    command: "libcxx/utils/ci/run-buildbot generic-module-std-cxx26"
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
@@ -208,6 +208,27 @@
   #
   - wait
 
+  - label: "C++23 Module std"
+    command: "libcxx/utils/ci/run-buildbot generic-module-std-cxx23"
+    artifact_paths:
+      - "**/test-results.xml"
+      - "**/*.abilist"
+    env:
+        # Note modules require and absolute path for clang-scan-deps
+        # https://github.com/llvm/llvm-project/issues/61006
+        CC: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang"
+        CXX: "/usr/lib/llvm-${LLVM_HEAD_VERSION}/bin/clang++"
+        CMAKE: "/opt/bin/cmake"
+        ENABLE_CLANG_TIDY: "On"
+    agents:
+      queue: "libcxx-builders"
+      os: "linux"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+    timeout_in_minutes: 120
+
   - label: "C++23"
     command: "libcxx/utils/ci/run-buildbot generic-cxx23"
     artifact_paths:
Index: libcxx/cmake/caches/Generic-module-std-cxx26.cmake
===================================================================
--- /dev/null
+++ libcxx/cmake/caches/Generic-module-std-cxx26.cmake
@@ -0,0 +1,3 @@
+set(LIBCXX_ENABLE_STD_MODULES ON CACHE BOOL "")
+set(LIBCXX_TEST_PARAMS "enable_modules=std;std=c++26" CACHE STRING "")
+set(LIBCXXABI_TEST_PARAMS "std=c++26" CACHE STRING "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153408.533210.patch
Type: text/x-patch
Size: 2818 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230621/27e3f848/attachment.bin>