summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatya Romanova <56653669+romanova-ekaterina@users.noreply.github.com>2025-11-18 01:24:38 -0800
committerGitHub <noreply@github.com>2025-11-18 01:24:38 -0800
commitbeb06eb884be10449b515f215c859fd432fb2635 (patch)
tree0c2f3e5ce4a9ddd1889cfb130219a1750c2f2a39
parent20795e06ed8b91109d5237ffb02f37245d1f781d (diff)
Fixed 2 tests that failed on MacOS (#168482)
1. Fixed 2 DTLTO cache tests that failed on MacOS because input to grep command is different compared to Windows 2. Removed unneeded comments from dtlto-cache.ll
-rw-r--r--cross-project-tests/dtlto/dtlto-cache.test8
-rw-r--r--cross-project-tests/dtlto/dtlto-thinlto-cache.test4
-rw-r--r--llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll7
3 files changed, 6 insertions, 13 deletions
diff --git a/cross-project-tests/dtlto/dtlto-cache.test b/cross-project-tests/dtlto/dtlto-cache.test
index b98d4dbb433b..5dd67a50ab2c 100644
--- a/cross-project-tests/dtlto/dtlto-cache.test
+++ b/cross-project-tests/dtlto/dtlto-cache.test
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/cross-project-tests/dtlto/dtlto-thinlto-cache.test b/cross-project-tests/dtlto/dtlto-thinlto-cache.test
index c177112e2dbb..9b0ca228480d 100644
--- a/cross-project-tests/dtlto/dtlto-thinlto-cache.test
+++ b/cross-project-tests/dtlto/dtlto-thinlto-cache.test
@@ -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.
@@ -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
diff --git a/llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll b/llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll
index df98c5e90b1a..129093452101 100644
--- a/llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll
+++ b/llvm/test/ThinLTO/X86/dtlto/dtlto-cache.ll
@@ -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"