diff options
| author | James Henderson <jh7370@my.bristol.ac.uk> | 2017-09-11 15:55:54 +0000 |
|---|---|---|
| committer | James Henderson <jh7370@my.bristol.ac.uk> | 2017-09-11 15:55:54 +0000 |
| commit | 4c2a3ec33bc1e2387eea497ca1047f65e4c35058 (patch) | |
| tree | d9c60b86cce3d276ff23ac31a7bcb41d3af613bc | |
| parent | 255488a1e08f1221849d1044ad7c610e169b8c9c (diff) | |
| download | bcm5719-llvm-4c2a3ec33bc1e2387eea497ca1047f65e4c35058.tar.gz bcm5719-llvm-4c2a3ec33bc1e2387eea497ca1047f65e4c35058.zip | |
[ELF] Fix issue with test when build path contains '@'
'@' is a valid character in file paths, but the linker script tokenizer treats it
as a separate token. This was leading to an unexpected test failure, on our local
builds. This patch changes the test to quote the path to prevent this happening.
An alternative would have been to add '@' to the list of "unquoted tokens" in
ScriptLexer.cpp, but ld.bfd has the same behaviour as the current LLD.
Reviewers: ruiu
Differential Revision: https://reviews.llvm.org/D37689
llvm-svn: 312922
| -rw-r--r-- | lld/test/ELF/linkerscript/include-cycle.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lld/test/ELF/linkerscript/include-cycle.s b/lld/test/ELF/linkerscript/include-cycle.s index fbbf86a6273..e93ed904f05 100644 --- a/lld/test/ELF/linkerscript/include-cycle.s +++ b/lld/test/ELF/linkerscript/include-cycle.s @@ -1,11 +1,11 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o -# RUN: echo INCLUDE %t1.script > %t1.script +# RUN: echo "INCLUDE \"%t1.script\"" > %t1.script # RUN: not ld.lld %t.o %t1.script 2>&1 | FileCheck %s -# RUN: echo INCLUDE %t2.script > %t1.script -# RUN: echo INCLUDE %t1.script > %t2.script +# RUN: echo "INCLUDE \"%t2.script\"" > %t1.script +# RUN: echo "INCLUDE \"%t1.script\"" > %t2.script # RUN: not ld.lld %t.o %t1.script 2>&1 | FileCheck %s # CHECK: there is a cycle in linker script INCLUDEs |
