From df48437acd35bef8d38a8a4a021e2e215639f89e Mon Sep 17 00:00:00 2001
From: Michal Gorny <mgorny@gentoo.org>
Date: Fri, 26 Jul 2019 15:38:57 +0000
Subject: [PATCH] [llvm] [FileCheck] Use FILECHECK_DUMP_INPUT_ON_FAILURE only
when non-empty
Enable dumping output only if FILECHECK_DUMP_INPUT_ON_FAILURE is set to
a non-empty value. This is necessary to support disabling it via
POSIX-compliant env(1) that does not support '-u' argument,
and therefore fix regression caused by r366980.
Differential Revision: https://reviews.llvm.org/D65334
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@367122 91177308-0d34-0410-b5e6-96231b3b80d8
---
utils/FileCheck/FileCheck.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp
index c882736d4bf..d9cad13c465 100644
--- a/utils/FileCheck/FileCheck.cpp
+++ b/utils/FileCheck/FileCheck.cpp
@@ -93,7 +93,8 @@ static cl::opt<bool> VerboseVerbose(
static const char * DumpInputEnv = "FILECHECK_DUMP_INPUT_ON_FAILURE";
static cl::opt<bool> DumpInputOnFailure(
- "dump-input-on-failure", cl::init(std::getenv(DumpInputEnv)),
+ "dump-input-on-failure",
+ cl::init(std::getenv(DumpInputEnv) && *std::getenv(DumpInputEnv)),
cl::desc("Dump original input to stderr before failing.\n"
"The value can be also controlled using\n"
"FILECHECK_DUMP_INPUT_ON_FAILURE environment variable.\n"
--
2.40.0