From 447abc57c554fd8fff14a52d32e68dff9a47cc5b Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sun, 27 Jan 2019 09:02:19 +0000 Subject: Revert "Detect incorrect FileCheck variable CLI definition" This reverts commit r351039. llvm-svn: 352309 --- llvm/utils/FileCheck/FileCheck.cpp | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'llvm/utils/FileCheck/FileCheck.cpp') diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp index 0d5f38acfa7..eb1b5ddfc7e 100644 --- a/llvm/utils/FileCheck/FileCheck.cpp +++ b/llvm/utils/FileCheck/FileCheck.cpp @@ -50,10 +50,9 @@ static cl::list ImplicitCheckNot( "this pattern occur which are not matched by a positive pattern"), cl::value_desc("pattern")); -static cl::list - GlobalDefines("D", cl::AlwaysPrefix, - cl::desc("Define a variable to be used in capture patterns."), - cl::value_desc("VAR=VALUE")); +static cl::list GlobalDefines("D", cl::Prefix, + cl::desc("Define a variable to be used in capture patterns."), + cl::value_desc("VAR=VALUE")); static cl::opt 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; -- cgit v1.2.3