[lld] r284768 - Add a space to work around a Windows CPython / MSys quoting bug

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Thu Oct 20 15:02:24 2016
New Revision: 284768

URL: http://llvm.org/viewvc/llvm-project?rev=284768&view=rev
Log:
Add a space to work around a Windows CPython / MSys quoting bug

Summary:
The rules for quoting the command line that a subprocess receives are
user space conventions implemented by the C runtime. Python's quoting
rules are implemented here:
https://github.com/python/cpython/blob/c30098c8c6014f3340a369a31df9c74bdbacc269/Lib/subprocess.py#L725

The result is that the final command line C string computed by Python is
'echo \"'. Mingw doesn't appear to interpret that backslash as escaping
the quote because it is not already inside a quoted region. As a result,
our echo command prints a single backslash instead of a quote.

The whole issue can be sidestepped by adding a space a forcing Python to
put the argument to echo in double quotes.

Reviewers: inglorion, ruiu

Subscribers: llvm-commits

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

Modified:
    lld/trunk/test/ELF/libsearch.s
    lld/trunk/test/ELF/version-script-err.s

Modified: lld/trunk/test/ELF/libsearch.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/libsearch.s?rev=284768&r1=284767&r2=284768&view=diff
==============================================================================
--- lld/trunk/test/ELF/libsearch.s (original)
+++ lld/trunk/test/ELF/libsearch.s Thu Oct 20 15:02:24 2016
@@ -90,7 +90,7 @@
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=DYNAMIC %s
 
 // -nostdlib
-// RUN: echo 'SEARCH_DIR("'%t.dir'")' > %t.script
+// RUN: echo ' SEARCH_DIR("'%t.dir'")' > %t.script
 // RUN: ld.lld -o %t3 %t.o -script %t.script -lls
 // RUN: not ld.lld -o %t3 %t.o -script %t.script -lls -nostdlib \
 // RUN:   2>&1 | FileCheck --check-prefix=NOSTDLIB %s

Modified: lld/trunk/test/ELF/version-script-err.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-err.s?rev=284768&r1=284767&r2=284768&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-err.s (original)
+++ lld/trunk/test/ELF/version-script-err.s Thu Oct 20 15:02:24 2016
@@ -4,7 +4,7 @@
 // RUN: not ld.lld -shared %t.o -o %t.so --version-script %p/Inputs/version-script-err.script 2>&1 | FileCheck %s
 // CHECK: ; expected, but got }
 
-// RUN: echo    "\"" > %terr1.script
+// RUN: echo    " \"" > %terr1.script
 // RUN: not ld.lld --version-script %terr1.script -shared %t.o -o %t.so 2>&1 | \
 // RUN:   FileCheck -check-prefix=ERR1 %s
 // ERR1: unclosed quote