From 447abc57c554fd8fff14a52d32e68dff9a47cc5b Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sun, 27 Jan 2019 09:02:19 +0000 Subject: [PATCH] Revert "Detect incorrect FileCheck variable CLI definition" This reverts commit r351039. llvm-svn: 352309 --- llvm/test/FileCheck/defines.txt | 26 +++++--------------------- llvm/utils/FileCheck/FileCheck.cpp | 26 ++++---------------------- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/llvm/test/FileCheck/defines.txt b/llvm/test/FileCheck/defines.txt index 05d1b7b..c788124 100644 --- a/llvm/test/FileCheck/defines.txt +++ b/llvm/test/FileCheck/defines.txt @@ -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" \ No newline at end of file diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp index 0d5f38a..eb1b5dd 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; -- 2.7.4