Use -fmodules-cache-path in all tests and avoid using CTAD with std::scoped_lock

Author: naveen-seth

clang/lib/Driver/ModulesDriver.cpp

@@ -582,7 +582,7 @@ void ScanResultCollector::ClangModuleDepsCollector::mergeGraph(
   SmallVector<ModuleDeps *> NewModuleDeps;
 
   {
-    std::scoped_lock SL(Lock);
+    std::scoped_lock<std::mutex> SL(Lock);
 
     for (auto &MD : ModuleGraph) {
       if (const auto It = ModuleGraphIndexByID.find(MD.ID);
@@ -726,7 +726,7 @@ SmallVector<size_t>
 SystemInputRegistry::getNewSystemInputs(ArrayRef<std::string> NamedDeps) {
   SmallVector<size_t, 8> ToSchedule;
   {
-    std::scoped_lock SL(Lock);
+    std::scoped_lock<std::mutex> SL(Lock);
     for (const auto &ModuleName : NamedDeps) {
       const auto It = NameToManifestIndex.find(ModuleName);
       if (It == NameToManifestIndex.end())

clang/test/Driver/modules-driver-dep-graph-with-system-inputs.cpp

@@ -27,13 +27,14 @@
 // RUN:   -stdlib=libc++ \
 // RUN:   -resource-dir=%t/Inputs/usr/lib/x86_64-linux-gnu \
 // RUN:   --target=x86_64-linux-gnu \
+// RUN:   -fmodules-cache-path=%t/modules-cache \
 // RUN:   %t/main.cpp %t/foo.cpp \
 // RUN:   -### 2>&1 \
 // RUN:   | sed 's:\\\\\?:/:g' \
 // RUN:   | FileCheck %s -DPREFIX=%/t
 
 // CHECK:      remark: using standard modules manifest file '[[PREFIX]]/Inputs/usr/lib/x86_64-linux-gnu/libc++.modules.json' [-Rmodules-driver]
-// CHECK-NEXT: remark: printing module dependency graph [-Rmodules-driver]
+// CHECK:      remark: printing module dependency graph [-Rmodules-driver]
 // CHECK-NEXT: digraph "Module Dependency Graph" {
 // CHECK-NEXT:         label="Module Dependency Graph";
 

clang/test/Driver/modules-driver-duplicate-named-module.cpp

@@ -3,6 +3,7 @@
 // RUN: split-file %s %t
 
 // RUN: not %clang -std=c++23 -fmodules -fmodules-driver -Rmodules-driver \
+// RUN:   -fmodules-cache-path=%t/modules-cache \
 // RUN:   %t/main.cpp %t/A1.cpp %t/A2.cpp 2>&1 \
 // RUN:   | sed 's:\\\\\?:/:g' \
 // RUN:   | FileCheck -DPREFIX=%/t --check-prefixes=CHECK %s

clang/test/Driver/modules-driver-malformed-module-manifest.cpp

@@ -19,6 +19,7 @@
 // RUN:   -stdlib=libc++ \
 // RUN:   -resource-dir=%t/Inputs/usr/lib/x86_64-linux-gnu \
 // RUN:   --target=x86_64-linux-gnu \
+// RUN:   -fmodules-cache-path=%t/modules-cache \
 // RUN:   main.cpp \
 // RUN:   -### 2>&1 \
 // RUN:   | sed 's:\\\\\?:/:g' \

clang/test/Driver/modules-driver-manifest-local-system-includes.cpp

@@ -24,6 +24,7 @@
 // RUN:   -stdlib=libc++ \
 // RUN:   -resource-dir=%t/Inputs/usr/lib/x86_64-linux-gnu \
 // RUN:   --target=x86_64-linux-gnu \
+// RUN:   -fmodules-cache-path=%t/modules-cache \
 // RUN:   %t/main.cpp \
 // RUN:   -### 2>&1 \
 // RUN:   | sed 's:\\\\\?:/:g' \