[PATCH] D59962: Update lit config for ld.lld command

[Rumeet Dhindsa via Phabricator via llvm-commits]

rdhindsa created this revision.
rdhindsa added a reviewer: rupprecht.
Herald added subscribers: llvm-commits, MaskRay, delcypher, arichardson, javed.absar, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.

1. Updated lit config for ld.lld command, for it to match "ld\.lld" instead of trying to match respective regex. (It was able to work with ld-lld and ld1lld as well)
2. Fixed the lld test using ld-lld command


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D59962

Files:
  lld/test/ELF/arm-exidx-add-missing.s
  llvm/utils/lit/lit/llvm/config.py


Index: llvm/utils/lit/lit/llvm/config.py
===================================================================
--- llvm/utils/lit/lit/llvm/config.py
+++ llvm/utils/lit/lit/llvm/config.py
@@ -484,11 +484,11 @@
         was_found = ld_lld and lld_link and ld64_lld and wasm_ld
         tool_substitutions = []
         if ld_lld:
-            tool_substitutions.append(ToolSubst('ld.lld', command=ld_lld))
+            tool_substitutions.append(ToolSubst('ld\.lld', command=ld_lld))
         if lld_link:
             tool_substitutions.append(ToolSubst('lld-link', command=lld_link))
         if ld64_lld:
-            tool_substitutions.append(ToolSubst('ld64.lld', command=ld64_lld))
+            tool_substitutions.append(ToolSubst('ld64\.lld', command=ld64_lld))
         if wasm_ld:
             tool_substitutions.append(ToolSubst('wasm-ld', command=wasm_ld))
         self.add_tool_substitutions(tool_substitutions)
Index: lld/test/ELF/arm-exidx-add-missing.s
===================================================================
--- lld/test/ELF/arm-exidx-add-missing.s
+++ lld/test/ELF/arm-exidx-add-missing.s
@@ -1,8 +1,8 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi --arm-add-build-attributes %s -o %t
-// RUN: ld-lld %t --no-merge-exidx-entries -o %t2
+// RUN: ld.lld %t --no-merge-exidx-entries -o %t2
 // RUN: llvm-objdump -s %t2 | FileCheck %s
-// RUN: ld-lld %t -o %t3
+// RUN: ld.lld %t -o %t3
 // RUN: llvm-objdump -s %t3 | FileCheck %s -check-prefix=CHECK-MERGE
 
 // The ARM.exidx section is a table of 8-byte entries of the form:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59962.192718.patch
Type: text/x-patch
Size: 1587 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190328/aa781868/attachment-0001.bin>