This is an archive of the discontinued LLVM Phabricator instance.

Differential D82658

[FileCheck][NFC] Clean up RUN style in verbose.txt test
ClosedPublic

Authored by jdenny on Jun 26 2020, 7:25 AM.

Details

Reviewers
jhenderson
thopre
probinson
Commits
rG632438726429: [FileCheck][NFC] Clean up RUN style in verbose.txt test

Diff Detail

Unit TestsFailed

TimeTest
9,680 mslinux > libomp.env::Unknown Unit Message ("")
1,700 mslinux > libomp.worksharing/for::Unknown Unit Message ("")

Event Timeline

jdenny created this revision.Jun 26 2020, 7:25 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 26 2020, 7:25 AM
jdenny added a child revision: D82601: [FileCheck] Permit multiple -v or -vv.Jun 26 2020, 7:26 AM
thopre accepted this revision.Jun 26 2020, 7:45 AM

LGTM

This revision is now accepted and ready to land.Jun 26 2020, 7:45 AM
Harbormaster failed remote builds in B61933: Diff 273726!Jun 26 2020, 8:44 AM
jhenderson accepted this revision.Jun 29 2020, 12:03 AM

LGTM, with optional suggestion.

llvm/test/FileCheck/verbose.txt
2–3

Can I make one minor suggestion whilst you're changing these lines: Change the single-dash arguments for double-dash (or vice versa, but I prefer the first). The reason is that there's an inconsistency in the number of dashes for different options, and it would be nice if it were consistent. It's not a big deal at all of course!

jdenny marked an inline comment as done.Jun 29 2020, 6:31 AM
jdenny added inline comments.
llvm/test/FileCheck/verbose.txt
2–3

Sure, but how do you prefer to write -vv?

jhenderson added inline comments.Jun 29 2020, 7:09 AM
llvm/test/FileCheck/verbose.txt
2–3

Hmmm... good question! I'd probably do single dash, but don't mind either way.

jdenny marked an inline comment as done.Jun 29 2020, 8:19 AM
jdenny added inline comments.
llvm/test/FileCheck/verbose.txt
2–3

OK, I'll go with -- for everything here but -v and -vv. Thanks.

Closed by commit rG632438726429: [FileCheck][NFC] Clean up RUN style in verbose.txt test (authored by jdenny). · Explain WhyJun 29 2020, 3:50 PM
This revision was automatically updated to reflect the committed changes.
jdenny marked 2 inline comments as done.

Revision Contents

PathSize
llvm/
test/
FileCheck/
19 lines

Diff 273726

llvm/test/FileCheck/verbose.txt

; RUN: %ProtectFileCheckOutput FileCheck -dump-input=never -input-file %s %s 2>&1 \ ; RUN: %ProtectFileCheckOutput \
; RUN: | FileCheck -check-prefix QUIET --allow-empty %s ; RUN: FileCheck -dump-input=never -input-file %s %s 2>&1 | \
; RUN: %ProtectFileCheckOutput FileCheck -dump-input=never -v -input-file %s %s 2>&1 \ ; RUN: FileCheck -check-prefix QUIET --allow-empty %s
jhendersonUnsubmitted
Done
ReplyInline Actions

Can I make one minor suggestion whilst you're changing these lines: Change the single-dash arguments for double-dash (or vice versa, but I prefer the first). The reason is that there's an inconsistency in the number of dashes for different options, and it would be nice if it were consistent. It's not a big deal at all of course!

jhenderson: Can I make one minor suggestion whilst you're changing these lines: Change the single-dash…
jdennyAuthorUnsubmitted
Done
ReplyInline Actions

Sure, but how do you prefer to write -vv?

jdenny: Sure, but how do you prefer to write `-vv`?
jhendersonUnsubmitted
Done
ReplyInline Actions

Hmmm... good question! I'd probably do single dash, but don't mind either way.

jhenderson: Hmmm... good question! I'd probably do single dash, but don't mind either way.
jdennyAuthorUnsubmitted
Done
ReplyInline Actions

OK, I'll go with -- for everything here but -v and -vv. Thanks.

jdenny: OK, I'll go with `--` for everything here but `-v` and `-vv`. Thanks.
; RUN: | FileCheck --strict-whitespace -check-prefix V %s
; RUN: %ProtectFileCheckOutput FileCheck -dump-input=never -vv -input-file %s %s 2>&1 \ ; RUN: %ProtectFileCheckOutput \
; RUN: | FileCheck --strict-whitespace -check-prefixes V,VV %s ; RUN: FileCheck -dump-input=never -v -input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace -check-prefix V %s
; RUN: %ProtectFileCheckOutput \
; RUN: FileCheck -dump-input=never -vv -input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace -check-prefixes V,VV %s
; END.
foo foo
bar bar
CHECK: foo CHECK: foo
CHECK-NOT: raboof CHECK-NOT: raboof
CHECK-NEXT: bar CHECK-NEXT: bar
V: verbose.txt:[[@LINE-4]]:8: remark: {{C}}HECK: expected string found in input V: verbose.txt:[[@LINE-4]]:8: remark: {{C}}HECK: expected string found in input
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines