This is an archive of the discontinued LLVM Phabricator instance.

Differential D72745

[MC][test] Fix non-portable GNU diff option
ClosedPublic

Authored by hubert.reinterpretcast on Jan 14 2020, 5:48 PM.

Details

Reviewers
daltenty
jasonliu
Commits
rG1794158f90f9: [MC][test] Fix non-portable GNU diff option
Summary

This patch replaces the non-portable GNU diff option --strip-trailing-cr with the POSIX -b option in two test files.

Diff Detail

Event Timeline

hubert.reinterpretcast created this revision.Jan 14 2020, 5:48 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 14 2020, 5:48 PM
Harbormaster completed remote builds in B44019: Diff 238151.Jan 14 2020, 5:51 PM
daltenty accepted this revision.Jan 15 2020, 6:30 AM

LGTM

This revision is now accepted and ready to land.Jan 15 2020, 6:30 AM
Closed by commit rG1794158f90f9: [MC][test] Fix non-portable GNU diff option (authored by hubert.reinterpretcast). · Explain WhyJan 16 2020, 8:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
test/
MC/
ARM/
2 lines
AsmParser/
2 lines

Diff 238514

llvm/test/MC/ARM/preserve-comments-arm.s

@RUN: llvm-mc -preserve-comments -n -triple arm-eabi < %s > %t @RUN: llvm-mc -preserve-comments -n -triple arm-eabi < %s > %t
@RUN: sed 's/#[C]omment/@Comment/g' %s > %t2 @RUN: sed 's/#[C]omment/@Comment/g' %s > %t2
@RUN: diff --strip-trailing-cr %t %t2 @RUN: diff -b %t %t2
.text .text
mov r0, r0 mov r0, r0
foo: #Comment here foo: #Comment here
mov r0, r0 @ EOL comment mov r0, r0 @ EOL comment
.ident "" .ident ""

llvm/test/MC/AsmParser/preserve-comments.s

#RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t #RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t
#RUN: diff --strip-trailing-cr %s %t #RUN: diff -b %s %t
.text .text
foo: #Comment here foo: #Comment here
#comment here #comment here
nop nop
#if DIRECTIVE COMMENT #if DIRECTIVE COMMENT
## WHOLE LINE COMMENT ## WHOLE LINE COMMENT
cmpl $196, %eax ## EOL COMMENT cmpl $196, %eax ## EOL COMMENT
#endif #endif
.ident "clang version 3.9.0" .ident "clang version 3.9.0"
.section ".note.GNU-stack","",@progbits .section ".note.GNU-stack","",@progbits