[lld] 9ecddde - [test] Fix ELF/linkerscript/input-archive.s w/ @ in path

[Thomas Preud'homme via llvm-commits]

Author: Thomas Preud'homme
Date: 2020-04-30T20:14:22+01:00
New Revision: 9ecddde321c2231e4440396dfd9f1a4718d38ba8

URL: https://github.com/llvm/llvm-project/commit/9ecddde321c2231e4440396dfd9f1a4718d38ba8
DIFF: https://github.com/llvm/llvm-project/commit/9ecddde321c2231e4440396dfd9f1a4718d38ba8.diff

LOG: [test] Fix ELF/linkerscript/input-archive.s w/ @ in path

Lld test ELF/linkerscript/input-archive.s fails when path contain a @
because is not accepted in unquoted token in linker scripts which leads
to the path being broken in 2 around the @. This commit quotes the path
used in the linker script created by this and similar testcases allowing
the test to pass even in the presence of an @ sign in the path.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D79103

Added: 
    

Modified: 
    lld/test/ELF/linkerscript/input-archive.s
    lld/test/ELF/linkerscript/thunk-gen-mips.s

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/linkerscript/input-archive.s b/lld/test/ELF/linkerscript/input-archive.s
index f70f3c6fa411..211c671409bf 100644
--- a/lld/test/ELF/linkerscript/input-archive.s
+++ b/lld/test/ELF/linkerscript/input-archive.s
@@ -11,7 +11,7 @@
 ## *.a:b.o matches /path/to/input-archive.s.tmp.a:b.o
 ## *b.o matches /path/to/input-archive.s.tmp.a:b.o
 # RUN: echo 'SECTIONS { \
-# RUN:   .foo : { %t.a:a.o(.data) } \
+# RUN:   .foo : { "%t.a:a.o"(.data) } \
 # RUN:   .bar : { *.a:b.o(.data) } \
 # RUN:   .qux : { *b.o(.data1) } \
 # RUN:   }' > %t.script

diff  --git a/lld/test/ELF/linkerscript/thunk-gen-mips.s b/lld/test/ELF/linkerscript/thunk-gen-mips.s
index 97d06d0ee654..3b7ea02176bb 100644
--- a/lld/test/ELF/linkerscript/thunk-gen-mips.s
+++ b/lld/test/ELF/linkerscript/thunk-gen-mips.s
@@ -4,14 +4,14 @@
 
 # SECTIONS command with the first pattern that does not match.
 # Linking a PIC and non-PIC object files triggers the LA25 thunk generation.
-# RUN:		echo "SECTIONS { \
+# RUN:		echo 'SECTIONS { \
 # RUN:		.text : { \
 # RUN:			*(.nomatch) \
-# RUN:			%t(.text) \
+# RUN:			"%t"(.text) \
 # RUN:			. = . + 0x100000 ; \
-# RUN:			%t1(.text) \
+# RUN:			"%t1"(.text) \
 # RUN:		} \
-# RUN:	}" > %t.script
+# RUN:	}' > %t.script
 # RUN: ld.lld -o %t.exe --script %t.script %t %t1
 # RUN: llvm-objdump -t %t.exe | FileCheck %s
 # CHECK: SYMBOL TABLE: