[llvm] r272670 - [FileCheck] Add --check-prefixes as a shorthand for multiple --check-prefix options.

[Daniel Sanders via llvm-commits]

Author: dsanders
Date: Tue Jun 14 09:28:04 2016
New Revision: 272670

URL: http://llvm.org/viewvc/llvm-project?rev=272670&view=rev
Log:
[FileCheck] Add --check-prefixes as a shorthand for multiple --check-prefix options.

Summary:
This new alias takes a comma separated list of prefixes which allows
'--check-prefix=A --check-prefix=B --check-prefix=C' to be written as
'--check-prefixes=A,B,C'.

Reviewers: probinson

Subscribers: probinson, llvm-commits, dsanders

Differential Revision: http://reviews.llvm.org/D21293

Modified:
    llvm/trunk/test/FileCheck/check-multiple-prefixes-mixed.txt
    llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch-2.txt
    llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch.txt
    llvm/trunk/test/FileCheck/multiple-missing-prefixes.txt
    llvm/trunk/utils/FileCheck/FileCheck.cpp

Modified: llvm/trunk/test/FileCheck/check-multiple-prefixes-mixed.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-multiple-prefixes-mixed.txt?rev=272670&r1=272669&r2=272670&view=diff
==============================================================================
--- llvm/trunk/test/FileCheck/check-multiple-prefixes-mixed.txt (original)
+++ llvm/trunk/test/FileCheck/check-multiple-prefixes-mixed.txt Tue Jun 14 09:28:04 2016
@@ -1,5 +1,7 @@
 // RUN: FileCheck -check-prefix=B -check-prefix=BOTH -input-file %s %s
 // RUN: FileCheck -check-prefix=A -check-prefix=BOTH -input-file %s %s
+// RUN: FileCheck -check-prefixes=B,BOTH -input-file %s %s
+// RUN: FileCheck -check-prefixes=A,BOTH -input-file %s %s
 
 ; A: {{a}}aaaaa
 ; B: {{b}}bbbb

Modified: llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch-2.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch-2.txt?rev=272670&r1=272669&r2=272670&view=diff
==============================================================================
--- llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch-2.txt (original)
+++ llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch-2.txt Tue Jun 14 09:28:04 2016
@@ -1,4 +1,6 @@
 ; RUN: not FileCheck -input-file %s %s -check-prefix=FOO -check-prefix=BAR 2>&1 | FileCheck %s
+; RUN: not FileCheck -input-file %s %s -check-prefixes=FOO,BAR 2>&1 | FileCheck %s
+; RUN: not FileCheck -input-file %s %s -check-prefixes=BAR,FOO 2>&1 | FileCheck %s
 
 fog
 bar

Modified: llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch.txt?rev=272670&r1=272669&r2=272670&view=diff
==============================================================================
--- llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch.txt (original)
+++ llvm/trunk/test/FileCheck/check-multiple-prefixes-nomatch.txt Tue Jun 14 09:28:04 2016
@@ -1,4 +1,6 @@
 ; RUN: not FileCheck -input-file %s %s -check-prefix=FOO -check-prefix=BAR 2>&1 | FileCheck %s
+; RUN: not FileCheck -input-file %s %s -check-prefixes=FOO,BAR 2>&1 | FileCheck %s
+; RUN: not FileCheck -input-file %s %s -check-prefixes=BAR,FOO 2>&1 | FileCheck %s
 
 BAR
 bar

Modified: llvm/trunk/test/FileCheck/multiple-missing-prefixes.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/multiple-missing-prefixes.txt?rev=272670&r1=272669&r2=272670&view=diff
==============================================================================
--- llvm/trunk/test/FileCheck/multiple-missing-prefixes.txt (original)
+++ llvm/trunk/test/FileCheck/multiple-missing-prefixes.txt Tue Jun 14 09:28:04 2016
@@ -1,5 +1,6 @@
 // RUN: FileCheck -check-prefix=ANOTHER-PREFIX -input-file %s %s
 // RUN: not FileCheck -check-prefix=PREFIX1 -check-prefix=PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK-NONEXISTENT-PREFIX -check-prefix=ALSO-NONEXISTENT %s
+// RUN: not FileCheck -check-prefixes=PREFIX1,PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefixes=CHECK-NONEXISTENT-PREFIX,ALSO-NONEXISTENT %s
 
 foobar
 ; ANOTHER-PREFIX: foobar

Modified: llvm/trunk/utils/FileCheck/FileCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/FileCheck/FileCheck.cpp?rev=272670&r1=272669&r2=272670&view=diff
==============================================================================
--- llvm/trunk/utils/FileCheck/FileCheck.cpp (original)
+++ llvm/trunk/utils/FileCheck/FileCheck.cpp Tue Jun 14 09:28:04 2016
@@ -45,6 +45,11 @@ InputFilename("input-file", cl::desc("Fi
 static cl::list<std::string>
 CheckPrefixes("check-prefix",
               cl::desc("Prefix to use from check file (defaults to 'CHECK')"));
+static cl::alias CheckPrefixesAlias(
+    "check-prefixes", cl::aliasopt(CheckPrefixes), cl::CommaSeparated,
+    cl::NotHidden,
+    cl::desc(
+        "Alias for -check-prefix permitting multiple comma separated values"));
 
 static cl::opt<bool>
 NoCanonicalizeWhiteSpace("strict-whitespace",