diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2018-07-20 20:21:57 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2018-07-20 20:21:57 +0000 |
| commit | 4571da68d10ac5432e60273492791d1878066bc9 (patch) | |
| tree | cc4099065c9a08a0e0577738e108e16307c2c1f4 /utils | |
| parent | 1f565f54cd4767e2105b5a94470bee1049bf1091 (diff) | |
[FileCheck] Provide an option for FileCheck to dump original input to stderr on failure
The option can be either set using environment variable (e.g. env
FILECHECK_DUMP_INPUT_ON_FAILURE=1 ninja check-fuzzer) or with a
FileCheck flag.
This can be extremely useful for debugging, cf.
https://groups.google.com/forum/#!topic/llvm-dev/kLrzg8OM_h8 for
discussion.
Differential Revision: https://reviews.llvm.org/D49328
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@337609 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/FileCheck/FileCheck.cpp | 13 | ||||
| -rw-r--r-- | utils/lit/lit/TestingConfig.py | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp index 60b71200dd5..b9cd99e8ffd 100644 --- a/utils/FileCheck/FileCheck.cpp +++ b/utils/FileCheck/FileCheck.cpp @@ -97,6 +97,13 @@ static cl::opt<bool> VerboseVerbose( "vv", cl::init(false), cl::desc("Print information helpful in diagnosing internal FileCheck\n" "issues. Implies -v.\n")); +static const char * DumpInputEnv = "FILECHECK_DUMP_INPUT_ON_FAILURE"; + +static cl::opt<bool> DumpInputOnFailure( + "dump-input-on-failure", cl::init(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")); typedef cl::list<std::string>::const_iterator prefix_iterator; @@ -1605,5 +1612,9 @@ int main(int argc, char **argv) { InputFileText, InputFile.getBufferIdentifier()), SMLoc()); - return CheckInput(SM, InputFileText, CheckStrings) ? EXIT_SUCCESS : 1; + int ExitCode = CheckInput(SM, InputFileText, CheckStrings) ? EXIT_SUCCESS : 1; + if (ExitCode == 1 && DumpInputOnFailure) + errs() << "Full input was:\n<<<<<<\n" << InputFileText << "\n>>>>>>\n"; + + return ExitCode; } diff --git a/utils/lit/lit/TestingConfig.py b/utils/lit/lit/TestingConfig.py index 3167974080d..e2ac73b0b42 100644 --- a/utils/lit/lit/TestingConfig.py +++ b/utils/lit/lit/TestingConfig.py @@ -25,7 +25,8 @@ class TestingConfig: 'CLANG', 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS', 'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL', 'SANITIZER_IGNORE_CVE_2016_2143', 'TMPDIR', 'TMP', 'TEMP', - 'TEMPDIR', 'AVRLIT_BOARD', 'AVRLIT_PORT'] + 'TEMPDIR', 'AVRLIT_BOARD', 'AVRLIT_PORT', + 'FILECHECK_DUMP_INPUT_ON_FAILURE'] for var in pass_vars: val = os.environ.get(var, '') # Check for empty string as some variables such as LD_PRELOAD cannot be empty |