This is an archive of the discontinued LLVM Phabricator instance.

Differential D61856

[test]Make test work on Windows
ClosedPublic

Authored by jhenderson on May 13 2019, 6:07 AM.

Details

Reviewers
khemant
aprantl
echristo
grimar
kzhuravl
Commits
rZORGa0711895c8c8: [test]Make test work on Windows
rZORG1c323fe48bba: [test]Make test work on Windows
rGa0711895c8c8: [test]Make test work on Windows
rG1c323fe48bba: [test]Make test work on Windows
rGce0da8ba82d0: [test]Make test work on Windows
rL360660: [test]Make test work on Windows
Summary

Previously, the test didn't work because '\' characters appeared in the sed string, causing bogus escape characters to form in the substituted string literal. Switching to using '%/p' causes the path to be emitted with '/' characters instead, so that there are are no escaping issues.

Diff Detail

Repository
rL LLVM

Event Timeline

jhenderson created this revision.May 13 2019, 6:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2019, 6:07 AM
Herald added a subscriber: rupprecht. · View Herald Transcript
kzhuravl accepted this revision.May 13 2019, 2:50 PM

LGTM, thanks!

This revision is now accepted and ready to land.May 13 2019, 2:50 PM
grimar accepted this revision.May 14 2019, 2:21 AM

LGTM, this works for me under windows.

MaskRay added a subscriber: MaskRay.May 14 2019, 2:43 AM
MaskRay added inline comments.
test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
1 ↗(On Diff #199260)

Use single quotes? BTW, I'm curious what backslashes in single quotes do (in the expanded sed -e 's,SRC_COMPDIR,%p/Inputs,g') do on Windows...

Closed by commit rL360660: [test]Make test work on Windows (authored by jhenderson). · Explain WhyMay 14 2019, 3:52 AM
This revision was automatically updated to reflect the committed changes.
jhenderson marked an inline comment as done.May 14 2019, 4:02 AM
jhenderson added inline comments.
test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
1 ↗(On Diff #199260)

I've not done this. Double-quotes work fine and are what were there before.

MaskRay added inline comments.May 14 2019, 8:06 AM
test/tools/llvm-objdump/X86/source-interleave-x86_64.ll
1 ↗(On Diff #199260)

It's fine. I was asking because in POSIX sh the backslash in single quotes wouldn't cause issues.

Revision Contents

PathSize
llvm/
trunk/
test/
tools/
llvm-objdump/
X86/
3 lines

Diff 199395

llvm/trunk/test/tools/llvm-objdump/X86/source-interleave-x86_64.ll

; REQUIRES: shell ; RUN: sed -e "s,SRC_COMPDIR,%/p/Inputs,g" %s > %t.ll
; RUN: sed -e "s,SRC_COMPDIR,%p/Inputs,g" %s > %t.ll
; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll ; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
; RUN: llvm-objdump -d -l %t.o >%t0 ; RUN: llvm-objdump -d -l %t.o >%t0
; RUN: llvm-objdump -dl %t.o >%t1 ; RUN: llvm-objdump -dl %t.o >%t1
; RUN: llvm-objdump -d -S %t.o >%t2 ; RUN: llvm-objdump -d -S %t.o >%t2
; RUN: llvm-objdump -dS %t.o >%t3 ; RUN: llvm-objdump -dS %t.o >%t3
; RUN: cmp %t0 %t1 ; RUN: cmp %t0 %t1
; RUN: cmp %t2 %t3 ; RUN: cmp %t2 %t3
; RUN: FileCheck --check-prefix=LINES %t.ll < %t0 ; RUN: FileCheck --check-prefix=LINES %t.ll < %t0
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines