RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[FileCheck] Permit multiple -v or -vv

Browse Source 
`FILECHECK_OPTS` was implemented so that a test runner, such as CI,
can specify FileCheck debugging options, such as `-v` and `-vv`.
However, if a test suite has a FileCheck call that already specifies
`-v` or `-vv`, then that call will fail if `FILECHECK_OPTS` also
specifies it.

For `-vv`, this problem already exists:

`clang/test/CodeGen/aarch64-v8.2a-fp16-intrinsics-constrained.c`

It's not yet clear if the `-vv` in that test was intentional, but this
usage shouldn't fail anyway.  It's already true that FileCheck permits
`-vv` and `-v` together even though `-vv` implies `-v`.

Compare D70784, which fixed the same problem for `-dump-input`.

Reviewed By: jhenderson, thopre

Differential Revision: https://reviews.llvm.org/D82601
This commit is contained in:
Joel E. Denny 2020-06-29 18:35:22 -04:00
parent 5366dbf89a
commit f5f29ea8b3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/FileCheck/verbose.txt
View File

@ -10,6 +10,22 @@
; RUN: FileCheck --dump-input=never -vv --input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace --check-prefixes V,VV %s
; RUN: %ProtectFileCheckOutput \
; RUN: FileCheck --dump-input=never -v -v --input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace --check-prefix V %s
; RUN: %ProtectFileCheckOutput \
; RUN: FileCheck --dump-input=never -vv -vv --input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace --check-prefixes V,VV %s
; RUN: %ProtectFileCheckOutput \
; RUN: FileCheck --dump-input=never -v -vv --input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace --check-prefixes V,VV %s
; RUN: %ProtectFileCheckOutput \
; RUN: FileCheck --dump-input=never -vv -v --input-file %s %s 2>&1 | \
; RUN: FileCheck --strict-whitespace --check-prefixes V,VV %s
; END.
foo

4
utils/FileCheck/FileCheck.cpp
View File

@ -97,12 +97,12 @@ static cl::opt<bool> AllowDeprecatedDagOverlap(
"non-overlapping CHECK-DAG implementation.\n"));
static cl::opt<bool> Verbose(
"v", cl::init(false),
"v", cl::init(false), cl::ZeroOrMore,
cl::desc("Print directive pattern matches, or add them to the input dump\n"
"if enabled.\n"));
static cl::opt<bool> VerboseVerbose(
"vv", cl::init(false),
"vv", cl::init(false), cl::ZeroOrMore,
cl::desc("Print information helpful in diagnosing internal FileCheck\n"
"issues, or add it to the input dump if enabled. Implies\n"
"-v.\n"));