[libcxx-commits] [libcxx] d2a61db - [libc++] Deflake the Clang Modules CI job

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-08-08T08:42:50-04:00
New Revision: d2a61db072e90ca15a8e5bc053aab878af5cb92a

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

LOG: [libc++] Deflake the Clang Modules CI job

This re-introduces the workaround that had been introduced in d7ca140c0122
and then removed in 0c0628c92c0d, since it seems like it is needed after all.

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

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index a505096f6bb753..d976a1b278b8e4 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -127,6 +127,10 @@ def getModuleFlag(cfg, enable_modules):
             AddFeature("modules-build"),
             AddCompileFlag("-fmodules"),
             AddCompileFlag("-fcxx-modules"), # AppleClang disregards -fmodules entirely when compiling C++. This enables modules for C++.
+            # Note: We use a custom modules cache path to make sure that we don't reuse
+            #       the default one, which can be shared across CI builds with 
diff erent
+            #       configurations.
+            AddCompileFlag(lambda cfg: f"-fmodules-cache-path={cfg.test_exec_root}/ModuleCache"),
         ]
         if enable_modules == "clang"
         else [