Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Revert "Detect incorrect FileCheck variable CLI definition"

Browse Source 
This reverts commit r351039.

llvm-svn: 352309
This commit is contained in:
Thomas Preud'homme 2019-01-27 09:02:19 +00:00
parent e97834e28f
commit 447abc57c5
2 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
llvm/test/FileCheck/defines.txt
View File

@ -3,32 +3,16 @@
;
; RUN: not FileCheck -DVALUE=10 -check-prefix NOT -input-file %s %s 2>&1 | FileCheck %s -check-prefix NOT-ERRMSG
; RUN: FileCheck -DVALUE=20 -check-prefix NOT -input-file %s %s
; RUN: not FileCheck -DVALUE10 -input-file %s %s 2>&1 | FileCheck %s -check-prefix ERRCLIEQ1
; RUN: not FileCheck -D -input-file %s %s 2>&1 | FileCheck %s -check-prefix ERRCLIEQ2
; RUN: not FileCheck -D=10 -input-file %s %s 2>&1 | FileCheck %s -check-prefix ERRCLIVAR1
; RUN: not FileCheck -D= -input-file %s %s 2>&1 | FileCheck %s -check-prefix ERRCLIVAR2
; RUN: FileCheck -DVALUE= -check-prefix EMPTY -input-file %s %s 2>&1
Value = 10
; CHECK: Value = [[VALUE]]
; NOT-NOT: Value = [[VALUE]]
; ERRMSG: defines.txt:[[@LINE-3]]:10: error: CHECK: expected string not found in input
; ERRMSG: defines.txt:8:10: error: CHECK: expected string not found in input
; ERRMSG: defines.txt:1:1: note: scanning from here
; ERRMSG: defines.txt:1:1: note: with variable "VALUE" equal to "20"
; ERRMSG: defines.txt:[[@LINE-7]]:1: note: possible intended match here
; ERRMSG: defines.txt:7:1: note: possible intended match here
; NOT-ERRMSG: defines.txt:[[@LINE-7]]:12: error: {{NOT}}-NOT: excluded string found in input
; NOT-ERRMSG: defines.txt:[[@LINE-10]]:1: note: found here
; NOT-ERRMSG: defines.txt:[[@LINE-11]]:1: note: with variable "VALUE" equal to "10"
; ERRCLIEQ1: Missing equal sign in command-line definition '-DVALUE10'
; ERRCLIEQ2: FileCheck: for the -D option: requires a value!
; ERRCLIVAR1: Missing pattern variable name in command-line definition '-D=10'
; ERRCLIVAR2: Missing pattern variable name in command-line definition '-D='
Empty value = @@
; EMPTY: Empty value = @[[VALUE]]@
; NOT-ERRMSG: defines.txt:9:12: error: {{NOT}}-NOT: excluded string found in input
; NOT-ERRMSG: defines.txt:7:1: note: found here
; NOT-ERRMSG: defines.txt:7:1: note: with variable "VALUE" equal to "10"

26
llvm/utils/FileCheck/FileCheck.cpp
View File

@ -50,10 +50,9 @@ static cl::list<std::string> ImplicitCheckNot(
"this pattern occur which are not matched by a positive pattern"),
cl::value_desc("pattern"));
static cl::list<std::string>
GlobalDefines("D", cl::AlwaysPrefix,
cl::desc("Define a variable to be used in capture patterns."),
cl::value_desc("VAR=VALUE"));
static cl::list<std::string> GlobalDefines("D", cl::Prefix,
cl::desc("Define a variable to be used in capture patterns."),
cl::value_desc("VAR=VALUE"));
static cl::opt<bool> AllowEmptyInput(
"allow-empty", cl::init(false),
@ -526,25 +525,8 @@ int main(int argc, char **argv) {
for (auto CheckNot : ImplicitCheckNot)
Req.ImplicitCheckNot.push_back(CheckNot);
bool GlobalDefineError = false;
for (auto G : GlobalDefines) {
size_t EqIdx = G.find('=');
if (EqIdx == std::string::npos) {
errs() << "Missing equal sign in command-line definition '-D" << G
<< "'\n";
GlobalDefineError = true;
continue;
}
if (EqIdx == 0) {
errs() << "Missing pattern variable name in command-line definition '-D"
<< G << "'\n";
GlobalDefineError = true;
continue;
}
for (auto G : GlobalDefines)
Req.GlobalDefines.push_back(G);
}
if (GlobalDefineError)
return 2;
Req.AllowEmptyInput = AllowEmptyInput;
Req.EnableVarScope = EnableVarScope;