Skip to content

Fixed 2 tests that failed on MacOS #168482

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
Nov 18, 2025
Merged

Fixed 2 tests that failed on MacOS #168482

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
8 changes: 4 additions & 4 deletions cross-project-tests/dtlto/dtlto-cache.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there are two backend compilation jobs occurred.
RUN: grep -wo args populate1.*.dist-file.json | wc -l | grep -qx 3
RUN: grep -wo args populate1.*.dist-file.json | wc -l | grep -qx "\s*3"
RUN: ls cache.dir/llvmcache.timestamp
RUN: ls cache.dir | count 3

Expand All @@ -32,7 +32,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there are no backend compilation jobs occurred.
RUN: grep -wo args populate2.*.dist-file.json | wc -l | grep -qx 1
RUN: grep -wo args populate2.*.dist-file.json | wc -l | grep -qx "\s*1"
RUN: ls cache.dir | count 3

RUN: %clang -O0 --target=x86_64-linux-gnu -flto=thin -c foo.c -o foo.O0.o
Expand All @@ -52,7 +52,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there are two new backend compilation jobs occurred.
RUN: grep -wo args populate3.*.dist-file.json | wc -l | grep -qx 3
RUN: grep -wo args populate3.*.dist-file.json | wc -l | grep -qx "\s*3"
RUN: ls cache.dir | count 5

RUN: %clang -O2 --target=x86_64-linux-gnu -flto=thin -c main-partial.c
Expand All @@ -69,7 +69,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there is one new backend compilation jobs occurred.
RUN: grep -wo args main-partial.*.dist-file.json | wc -l | grep -qx 2
RUN: grep -wo args main-partial.*.dist-file.json | wc -l | grep -qx "\s*2"
RUN: ls cache.dir | count 6

#--- foo.c
Expand Down
4 changes: 2 additions & 2 deletions cross-project-tests/dtlto/dtlto-thinlto-cache.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there are two backend compilation jobs occurred.
RUN: grep -wo args populate1.*.dist-file.json | wc -l | grep -qx 3
RUN: grep -wo args populate1.*.dist-file.json | wc -l | grep -qx "\s*3"
RUN: ls cache.dir | count 5

# Clean up cache directory.
Expand All @@ -45,7 +45,7 @@ RUN: -Wl,--thinlto-cache-dir=cache.dir \
RUN: -Wl,--save-temps

# Check that there are two backend compilation jobs occurred.
RUN: grep -wo args populate2.*.dist-file.json | wc -l | grep -qx 3
RUN: grep -wo args populate2.*.dist-file.json | wc -l | grep -qx "\s*3"
RUN: ls cache.dir/llvmcache.timestamp
RUN: ls cache.dir | count 3

Expand Down
7 changes: 0 additions & 7 deletions llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,11 @@ THINLTO-DAG: {{^}}t.o.2{{$}}

RUN: %{command}

; Check that the expected output files have been created.
RUN: ls | count 3
; Check that two native object files has been created
RUN: ls | FileCheck %s --check-prefix=THINLTO
; Check that DTLTO cache directory has been created
RUN: ls cache-dir/* | count 2
; Check that 2 cache entries are created
RUN: ls cache-dir/llvmcache-* | count 2




;--- t1.ll

target triple = "x86_64-unknown-linux-gnu"
Expand Down
Loading