From 056774d13b0f61d19d2c73302bde01261b9ec9c6 Mon Sep 17 00:00:00 2001 From: Matt Morehouse Date: Tue, 5 Dec 2017 17:13:17 +0000 Subject: [PATCH] [libFuzzer] Make redirects happen in proper sequence. "> file" must come before "2>&1" to have redirection occur correctly in all cases. Fixes a regression on minimize_two_crashes.test. llvm-svn: 319792 --- compiler-rt/lib/fuzzer/FuzzerCommand.h | 4 ++-- compiler-rt/lib/fuzzer/tests/FuzzerUnittest.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/fuzzer/FuzzerCommand.h b/compiler-rt/lib/fuzzer/FuzzerCommand.h index 358f89094310..c5500ed21fc1 100644 --- a/compiler-rt/lib/fuzzer/FuzzerCommand.h +++ b/compiler-rt/lib/fuzzer/FuzzerCommand.h @@ -143,10 +143,10 @@ public: std::stringstream SS; for (auto arg : getArguments()) SS << arg << " "; - if (isOutAndErrCombined()) - SS << "2>&1 "; if (hasOutputFile()) SS << ">" << getOutputFile() << " "; + if (isOutAndErrCombined()) + SS << "2>&1 "; std::string result = SS.str(); if (!result.empty()) result = result.substr(0, result.length() - 1); diff --git a/compiler-rt/lib/fuzzer/tests/FuzzerUnittest.cpp b/compiler-rt/lib/fuzzer/tests/FuzzerUnittest.cpp index bba4fd6b90f5..c1129995474e 100644 --- a/compiler-rt/lib/fuzzer/tests/FuzzerUnittest.cpp +++ b/compiler-rt/lib/fuzzer/tests/FuzzerUnittest.cpp @@ -923,7 +923,7 @@ TEST(FuzzerCommand, SetOutput) { EXPECT_TRUE(Cmd.isOutAndErrCombined()); CmdLine = Cmd.toString(); - EXPECT_EQ(CmdLine, makeCmdLine("", "2>&1 >thud")); + EXPECT_EQ(CmdLine, makeCmdLine("", ">thud 2>&1")); } int main(int argc, char **argv) {