Skip to content

Fix the following CAS-related tests on Windows #11320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2025
Merged

Fix the following CAS-related tests on Windows #11320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions clang/test/ClangScanDeps/cas-case-sensitivity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
// RUN: sed -e 's/^.*llvmcas/llvmcas/' -e 's/ for.*$//' %t/result1.txt > %t/casid1
// RUN: sed -e 's/^.*llvmcas/llvmcas/' -e 's/ for.*$//' %t/result2.txt > %t/casid2

// RUN: llvm-cas --cas %t/cas --ls-tree-recursive @%t/casid1 | FileCheck -check-prefix=TREE %s -DPREFIX=%/t
// RUN: llvm-cas --cas %t/cas --ls-tree-recursive @%t/casid2 | FileCheck -check-prefix=TREE %s -DPREFIX=%/t
// RUN: llvm-cas --cas %t/cas --ls-tree-recursive @%t/casid1 | FileCheck -check-prefix=TREE %s -DPREFIX=%{t-tree-/}
Copy link

@jansvoboda11 jansvoboda11 Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain what the difference between %/t and %{t-tree-/} is?

Copy link
Author

@hjyamauchi hjyamauchi Sep 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Windows %{t-tree-/} has an extra prefix / like /C:/foo. tree stands for the tree path which we currently/internally define this way to handle multiple roots for Windows. No difference on non-Windows.

Copy link
Author

@hjyamauchi hjyamauchi Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jansvoboda11 is it okay to merge?

// RUN: llvm-cas --cas %t/cas --ls-tree-recursive @%t/casid2 | FileCheck -check-prefix=TREE %s -DPREFIX=%{t-tree-/}

// asdf: FileCheck -check-prefix=TREE %s -input-file %t/result1.txt -DPREFIX=%/t

// TREE: file llvmcas://{{.*}} [[PREFIX]]/Header.h
// TREE: syml llvmcas://{{.*}} [[PREFIX]]/header.h -> Header
// TREE: file llvmcas://{{.*}} [[PREFIX]]/t{{[12]}}.c
// TREE: file llvmcas://{{.*}} [[PREFIX]]{{/|\\}}Header.h
// TREE: syml llvmcas://{{.*}} [[PREFIX]]{{/|\\}}header.h -> Header
// TREE: file llvmcas://{{.*}} [[PREFIX]]{{/|\\}}t{{[12]}}.c

//--- cdb1.json.template
[
Expand Down
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/cas-fs-multiple-commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// RUN: cat %t/deps.0.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t

// RUN: CLANG_CACHE_USE_CASFS_DEPSCAN=1 c-index-test core -scan-deps -working-dir %t -cas-path %t/cas -output-dir %t/modules -- \
// RUN: env CLANG_CACHE_USE_CASFS_DEPSCAN=1 c-index-test core -scan-deps -working-dir %t -cas-path %t/cas -output-dir %t/modules -- \
// RUN: %clang -target x86_64-apple-darwin -c %t/tu.c -save-temps=obj -o %t/tu.o \
// RUN: -fmodules -fimplicit-modules -fimplicit-module-maps -fmodules-cache-path=%t/cache \
// RUN: > %t/deps.txt
Expand Down
6 changes: 3 additions & 3 deletions clang/test/ClangScanDeps/include-tree-preserve-pch-path.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
// RUN: %deps-to-rsp %t/deps_tu.json --tu-index 0 > %t/tu.rsp
// RUN: %clang @%t/tu.rsp

// RUN: cat %t/tu.ll | FileCheck %s -check-prefix=LLVMIR -DPREFIX=%/t
// LLVMIR: !DIFile(filename: "[[PREFIX]]/tu.c", directory: "")
// LLVMIR: !DICompileUnit({{.*}}, splitDebugFilename: "[[PREFIX]]/prefix.pch"
// RUN: cat %t/tu.ll | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s -check-prefix=LLVMIR
// LLVMIR: !DIFile(filename: "PREFIX{{/|\\\\}}tu.c", directory: "")
// LLVMIR: !DICompileUnit({{.*}}, splitDebugFilename: "PREFIX{{/|\\\\}}prefix.pch"
// LLVMIR: !DIFile(filename: "prefix.h", directory: "")

// Extract include-tree casid
Expand Down
19 changes: 17 additions & 2 deletions llvm/lib/CAS/CachingOnDiskFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,21 @@ CachingOnDiskFileSystemImpl::makeSymlinkTo(DirectoryEntry &Parent,
TargetStorage.Path);
}

static bool is_executable(StringRef TreePath, sys::fs::file_status Status,
sys::path::Style PathStyle) {
#ifndef _WIN32
return Status.permissions() & sys::fs::perms::owner_exe;
#else
// This isn't the most reliable way but does better than just
// checking owner_exe because most owned files have all_all
// permission regardless of they are executable files.
StringRef FilePath = getFilePath(TreePath, PathStyle);
return (Status.permissions() & sys::fs::perms::owner_exe) &&
(FilePath.ends_with_insensitive(".exe") ||
sys::fs::exists(FilePath + ".exe"));
#endif
}

Expected<FileSystemCache::DirectoryEntry *>
CachingOnDiskFileSystemImpl::makeFile(DirectoryEntry &Parent,
StringRef TreePath, sys::fs::file_t F,
Expand All @@ -371,8 +386,8 @@ CachingOnDiskFileSystemImpl::makeFile(DirectoryEntry &Parent,
return Handle.takeError();
// Do not trust Status.size() in case the file is volatile.
return &Cache->makeFile(Parent, TreePathStorage.Path, *Node,
Handle->getData().size(),
Status.permissions() & sys::fs::perms::owner_exe);
Handle->getData().size(),
is_executable(TreePath, Status, Cache->getPathStyle()));
}

Expected<FileSystemCache::DirectoryEntry *>
Expand Down
8 changes: 8 additions & 0 deletions llvm/utils/lit/lit/TestRunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,14 @@ def regex_escape(s):
# a leading slash.
substitutions.append(("%:" + letter, colonNormalizePath(path)))

substitutions.extend(
[
# %t (tmpName) in tree path forms for Windows
("%{t-tree}", "\\" + tmpName if kIsWindows else tmpName),
("%{t-tree-/}", "/" + tmpName.replace("\\", "/") if kIsWindows else tmpName),
]
)

return substitutions


Expand Down