[PATCH] D37689: [ELF] Fix flaky test

James Henderson via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 11 08:35:28 PDT 2017


jhenderson updated this revision to Diff 114620.
jhenderson added a comment.

Oops. Should have paid more attention!

The '@' comes from the %t. In our build system, there is sometimes an '@' in the workspace where this is run, causing the problem.


https://reviews.llvm.org/D37689

Files:
  test/ELF/linkerscript/include-cycle.s


Index: test/ELF/linkerscript/include-cycle.s
===================================================================
--- test/ELF/linkerscript/include-cycle.s
+++ 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37689.114620.patch
Type: text/x-patch
Size: 773 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170911/3135032b/attachment.bin>


More information about the llvm-commits mailing list