[PATCH] D110353: [ELF][test] Fix several LLD ICF tests

[Andrew Ng via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG39f3f7c08fb6: [ELF][test] Fix several LLD ICF tests (authored by andrewng).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D110353/new/

https://reviews.llvm.org/D110353

Files:
  lld/test/ELF/icf-non-mergeable.s
  lld/test/ELF/icf-none.s
  lld/test/ELF/icf3.s
  lld/test/ELF/icf4.s
  lld/test/ELF/icf5.s
  lld/test/ELF/icf6.s


Index: lld/test/ELF/icf6.s
===================================================================
--- lld/test/ELF/icf6.s
+++ lld/test/ELF/icf6.s
@@ -1,10 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
Index: lld/test/ELF/icf5.s
===================================================================
--- lld/test/ELF/icf5.s
+++ lld/test/ELF/icf5.s
@@ -1,10 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
Index: lld/test/ELF/icf4.s
===================================================================
--- lld/test/ELF/icf4.s
+++ lld/test/ELF/icf4.s
@@ -1,10 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
Index: lld/test/ELF/icf3.s
===================================================================
--- lld/test/ELF/icf3.s
+++ lld/test/ELF/icf3.s
@@ -2,10 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/icf2.s -o %t2
-# RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1' from file
-# CHECK-NOT: selected section '.text.f2' from file
+# RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
Index: lld/test/ELF/icf-none.s
===================================================================
--- lld/test/ELF/icf-none.s
+++ lld/test/ELF/icf-none.s
@@ -1,9 +1,7 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --icf=none --verbose 2>&1 | FileCheck %s
-
-# CHECK-NOT: selected section '.text.f1'
+# RUN: ld.lld %t -o /dev/null --icf=all --icf=none --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
Index: lld/test/ELF/icf-non-mergeable.s
===================================================================
--- lld/test/ELF/icf-non-mergeable.s
+++ lld/test/ELF/icf-non-mergeable.s
@@ -8,10 +8,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 // RUN:    %p/Inputs/icf-non-mergeable.s -o %t2
 
-// RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --verbose 2>&1 | FileCheck %s
-
-// CHECK-NOT: selected section '.text.f1'
-// CHECK-NOT:   removing identical section '.text.f2'
+// RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2, d1, d2
 _start:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D110353.376845.patch
Type: text/x-patch
Size: 3343 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211004/c367a948/attachment.bin>