[PATCH] D118282: [BOLT][TEST] Adjust tests for BOLT_CLANG_EXE=clang-{6..9}

[Amir Ayupov via Phabricator via llvm-commits]

Amir created this revision.
Amir added reviewers: maksfb, rafauler, yota9.
Herald added a subscriber: ayermolo.
Amir requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Fix tests to pass with clang-6:
http://157.230.108.44:8011/#/builders/14/builds/56


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D118282

Files:
  bolt/test/X86/asm-func-debug.test
  bolt/test/X86/symtab-secondary-entries.test


Index: bolt/test/X86/symtab-secondary-entries.test
===================================================================
--- bolt/test/X86/symtab-secondary-entries.test
+++ bolt/test/X86/symtab-secondary-entries.test
@@ -1,6 +1,8 @@
 # Check that secondary entry points are updated correctly in the ELF symtab
 
-RUN: %clang %p/Inputs/user-order.S -Wl,-q -o %t.exe -nostdlib
+RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
+RUN:   %p/Inputs/user-order.S -o %t.o
+RUN: ld.lld %t.o --emit-relocs --nostdlib -o %t.exe
 RUN: llvm-bolt %t.exe -o %t -reorder-functions=user \
 RUN:   -function-order=%p/Inputs/order.txt
 
Index: bolt/test/X86/asm-func-debug.test
===================================================================
--- bolt/test/X86/asm-func-debug.test
+++ bolt/test/X86/asm-func-debug.test
@@ -14,7 +14,7 @@
 CHECK-NEXT:       DW_AT_ranges
 CHECK-NEXT:          [0x0000000000[[#%x,ADDR:]],
 CHECK-SAME:                              0x0000000000[[#ADDR+1]]))
-CHECK-NEXT:       DW_AT_name ("{{.*}}/asm_foo.s")
+CHECK-NEXT:       DW_AT_name ("{{.*}}asm_foo.s")
 
 # Check .debug_aranges was updated for asm module
 CHECK: .debug_aranges contents:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118282.403393.patch
Type: text/x-patch
Size: 1167 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220126/fe1c122e/attachment.bin>