Merge pull request #7803 from apple/jan_svoboda/next-failing-tests-fix

[clang][deps] Fix failing test relying on remarks in system modules

Author: jansvoboda11

clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c

@@ -11,13 +11,13 @@
 // RUN: clang-scan-deps -compilation-database %t/dir1/cdb.json -format experimental-full \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir1/modules \
 // RUN:    -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
-// RUN:    -prefix-map=%t/dir1/modules=/^modules -prefix-map=%t/dir1=/^src \
+// RUN:    -prefix-map=%t/dir1/modules=/^modules -prefix-map=%t/dir1=/^src -optimize-args=none \
 // RUN:  > %t/dir1.txt
 
 // RUN: clang-scan-deps -compilation-database %t/dir2/cdb.json -format experimental-full \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir2/modules \
 // RUN:    -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
-// RUN:    -prefix-map=%t/dir2/modules=/^modules -prefix-map=%t/dir2=/^src \
+// RUN:    -prefix-map=%t/dir2/modules=/^modules -prefix-map=%t/dir2=/^src -optimize-args=none \
 // RUN:  > %t/dir2.txt
 
 // Extract individual commands.

clang/test/ClangScanDeps/modules-include-tree-prefix-map.c

@@ -9,7 +9,7 @@
 // RUN: clang-scan-deps -compilation-database %t/cdb1.json \
 // RUN:   -cas-path %t/cas -module-files-dir %t/dir1/outputs \
 // RUN:   -prefix-map=%t/dir1/outputs=/^modules -prefix-map=%t/dir1=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
-// RUN:   -format experimental-include-tree-full -mode preprocess-dependency-directives \
+// RUN:   -format experimental-include-tree-full -mode preprocess-dependency-directives -optimize-args=none \
 // RUN:   > %t/deps.json
 
 // Extract the include-tree commands
@@ -291,7 +291,7 @@
 // RUN: clang-scan-deps -compilation-database %t/cdb2.json \
 // RUN:   -cas-path %t/cas -module-files-dir %t/dir2/outputs \
 // RUN:   -prefix-map=%t/dir2/outputs=/^modules -prefix-map=%t/dir2=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
-// RUN:   -format experimental-include-tree-full -mode preprocess-dependency-directives \
+// RUN:   -format experimental-include-tree-full -mode preprocess-dependency-directives -optimize-args=none \
 // RUN:   > %t/deps2.json
 
 // RUN: %deps-to-rsp %t/deps2.json --module-name Top > %t/Top2.rsp

clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c

@@ -11,12 +11,12 @@
 // RUN: sed -e "s|DIR|%t/dir2|g" -e "s|CLANG|%clang|g" -e "s|SDK|%S/Inputs/SDK|g" %t/cdb_pch.json.template > %t/dir2/cdb_pch.json
 
 // == Scan PCH
-// RUN: clang-scan-deps -compilation-database %t/dir1/cdb_pch.json -format experimental-full \
+// RUN: clang-scan-deps -compilation-database %t/dir1/cdb_pch.json -format experimental-full -optimize-args=none \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir1/modules \
 // RUN:    -prefix-map=%t/dir1/modules=/^modules -prefix-map=%t/dir1=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
 // RUN:  > %t/pch_dir1.txt
 
-// RUN: clang-scan-deps -compilation-database %t/dir2/cdb_pch.json -format experimental-full \
+// RUN: clang-scan-deps -compilation-database %t/dir2/cdb_pch.json -format experimental-full -optimize-args=none \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir2/modules \
 // RUN:    -prefix-map=%t/dir2/modules=/^modules -prefix-map=%t/dir2=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
 // RUN:  > %t/pch_dir2.txt
@@ -45,12 +45,12 @@
 // CACHE-HIT: compile job cache hit
 
 // == Scan TU, including PCH
-// RUN: clang-scan-deps -compilation-database %t/dir1/cdb.json -format experimental-full \
+// RUN: clang-scan-deps -compilation-database %t/dir1/cdb.json -format experimental-full -optimize-args=none \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir1/modules \
 // RUN:    -prefix-map=%t/dir1/modules=/^modules -prefix-map=%t/dir1=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
 // RUN:  > %t/dir1.txt
 
-// RUN: clang-scan-deps -compilation-database %t/dir2/cdb.json -format experimental-full \
+// RUN: clang-scan-deps -compilation-database %t/dir2/cdb.json -format experimental-full -optimize-args=none \
 // RUN:    -cas-path %t/cas -module-files-dir %t/dir2/modules \
 // RUN:    -prefix-map=%t/dir2/modules=/^modules -prefix-map=%t/dir2=/^src -prefix-map-sdk=/^sdk -prefix-map-toolchain=/^tc \
 // RUN:  > %t/dir2.txt