[PATCH] D55825: [FileCheck] Suppress old -v/-vv diags if dumping input

[Paul Robinson via Phabricator via llvm-commits]

probinson added a comment.

Thanks for the ping.  The code change looks straightforward, but a handful of questions on the tests.



================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:24
+; ALIGN:{{.*}}error:{{.*}}
+; ALIGN:{{.*}}possible intended match here{{.*}}
+
----------------
This kind of sequence always makes me wonder whether the NOT text might appear after one of the other lines gets a match. If 'remark' shouldn't occur at all, then maybe use `-implicit-check-not` on the run line?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:62
+; Verbose diagnostics are suppressed but not errors.
+; CHK-NOT: {{.*}}remark:{{.*}}
+; CHK: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:97
+; Verbose diagnostics are suppressed but not errors.
+; CNT-NOT: {{.*}}remark:{{.*}}
+; CNT: {{.*}}error:{{.*}}
----------------
implict-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:132
+; Verbose diagnostics are suppressed but not errors.
+; NXT-NOT: {{.*}}remark:{{.*}}
+; NXT: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:183
+; Verbose diagnostics are suppressed but not errors.
+; SAM-NOT: {{.*}}remark:{{.*}}
+; SAM: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:202
+; Verbose diagnostics are suppressed but not errors.
+; SAM2-NOT: {{.*}}remark:{{.*}}
+; SAM2: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:244
+; Verbose diagnostics are suppressed but not errors.
+; EMP-NOT: {{.*}}remark:{{.*}}
+; EMP: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:276
+; Verbose diagnostics are suppressed but not errors.
+; EMP2-NOT: {{.*}}remark:{{.*}}
+; EMP2: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:309
+; Verbose diagnostics are suppressed but not errors.
+; NOT-NOT: {{.*}}remark:{{.*}}
+; NOT: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:337
+; Verbose diagnostics are suppressed but not errors.
+; NOT2-NOT: {{.*}}remark:{{.*}}
+; NOT2: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:382
+; Verbose diagnostics are suppressed but not errors.
+; DAG-NOT: {{.*}}remark:{{.*}}
+; DAG: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-annotations.txt:427
+; Verbose diagnostics are suppressed but not errors.
+; LAB-NOT: {{.*}}remark:{{.*}}
+; LAB: {{.*}}error:{{.*}}
----------------
implicit-check-not?


================
Comment at: llvm/test/FileCheck/dump-input-enable.txt:7
 
-; RUN: echo 'CHECK: ciao' > %t.check
+; RUN: echo 'CHECK: hello' > %t.check
 ; RUN: echo 'CHECK-NEXT: world' >> %t.check
----------------
So, this first set of changes goes from matching (or not) on the first line, to always matching the first line, and matching (or not) on the second line.  Does that make a material difference in the test? 


================
Comment at: llvm/test/FileCheck/dump-input-enable.txt:46
+; RUN:           -match-full-lines -dump-input=never -v 2>&1 \
+; RUN: | FileCheck %s -match-full-lines -check-prefixes=TRACE,NODUMP
 
----------------
Offhand it looks like every use of `-dump-input` in this file now also has `-v` which seems excessive. Also like you're losing coverage of that combination. Think about using `-v` more judiciously here.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D55825/new/

https://reviews.llvm.org/D55825