[clang] [clang][test][NFC] Fix dependency test failures (PR #178113)
Ian Anderson via cfe-commits
cfe-commits at lists.llvm.org
Mon Jan 26 23:27:32 PST 2026
https://github.com/ian-twilightcoder updated https://github.com/llvm/llvm-project/pull/178113
>From 1b2122aa44a76ab8a388e6d6e5b002590ac608ab Mon Sep 17 00:00:00 2001
From: Ian Anderson <iana at apple.com>
Date: Mon, 26 Jan 2026 20:42:05 -0800
Subject: [PATCH] [clang][test][NFC] Fix dependency test failures
If the path to SDKSettings.json is short enough, it will go on the same line as the file in the output.
---
clang/test/ClangScanDeps/target-filename.cpp | 10 +++++-----
clang/test/Frontend/dependency-gen-phony.c | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/clang/test/ClangScanDeps/target-filename.cpp b/clang/test/ClangScanDeps/target-filename.cpp
index 982dd83643426..ddc12ba504c7f 100644
--- a/clang/test/ClangScanDeps/target-filename.cpp
+++ b/clang/test/ClangScanDeps/target-filename.cpp
@@ -5,18 +5,18 @@
// RUN: mkdir %t.dir/Inputs
// RUN: cp %S/Inputs/header.h %t.dir/Inputs/header.h
// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/target-filename-cdb.json > %t.cdb
-// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s %if system-darwin %{ --check-prefixes=CHECK,CHECK-DARWIN %}
+// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s --check-prefixes=CHECK,%if system-darwin %{CHECK-DARWIN %} %else %{CHECK-NON-DARWIN %}
// CHECK: target-filename_input.o:
// CHECK-DARWIN-NEXT: SDKSettings.json
// CHECK-NEXT: target-filename_input.cpp
-// CHECK-NEXT: a.o:
-// CHECK-DARWIN-NEXT: SDKSettings.json
+// CHECK-NON-DARWIN-NEXT: a.o:
+// CHECK-DARWIN-NEXT: a.o:{{.*[[:space:]].*}}SDKSettings.json
// CHECK-NEXT: target-filename_input.cpp
-// CHECK-NEXT: b.o:
-// CHECK-DARWIN-NEXT: SDKSettings.json
+// CHECK-NON-DARWIN-NEXT: b.o:
+// CHECK-DARWIN-NEXT: b.o:{{.*[[:space:]].*}}SDKSettings.json
// CHECK-NEXT: target-filename_input.cpp
// CHECK-NEXT: last.o:
diff --git a/clang/test/Frontend/dependency-gen-phony.c b/clang/test/Frontend/dependency-gen-phony.c
index 99e933916aeec..bb456a254d917 100644
--- a/clang/test/Frontend/dependency-gen-phony.c
+++ b/clang/test/Frontend/dependency-gen-phony.c
@@ -25,8 +25,7 @@
// STDIO-NEXT: {{.*}}empty.h:
// STDIO-NOT: {{.}}
-// STDIO-DARWIN: -.o: \
-// STDIO-DARWIN-NEXT: SDKSettings.json \
+// STDIO-DARWIN: -.o:{{.*[[:space:]].*}}SDKSettings.json
// STDIO-DARWIN-NEXT: Inputs{{/|\\}}empty.h
// STDIO-DARWIN-NEXT: {{.*}}SDKSettings.json:
// STDIO-DARWIN-NEXT: {{.*}}empty.h:
More information about the cfe-commits
mailing list