From 817a292690ccdea7bae185319beb22ea653db946 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 26 Aug 2019 12:41:19 +0200 Subject: Process Command: Do not needlessly interpret output as text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... when redirecting process output. Only do that if there is an output filter function. Otherwise, we break redirection of binary data. Fixes: QBS-1488 Change-Id: Ic5a1d2653fa8fc9c4f0eb5d31b7315d7aba3e030 Reviewed-by: Jörg Bornemann --- tests/auto/blackbox/tst_blackbox.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/auto/blackbox/tst_blackbox.cpp') diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index f87889155..19676d050 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6263,6 +6263,14 @@ void TestBlackbox::outputArtifactAutoTagging() QVERIFY(regularFileExists(relativeExecutableFilePath("output-artifact-auto-tagging"))); } +void TestBlackbox::outputRedirection() +{ + QDir::setCurrent(testDataDir + "/output-redirection"); + QCOMPARE(runQbs(), 0); + TEXT_FILE_COMPARE("output.txt", relativeProductBuildDir("the-product") + "/output.txt"); + TEXT_FILE_COMPARE("output.bin", relativeProductBuildDir("the-product") + "/output.bin"); +} + void TestBlackbox::wildCardsAndRules() { QDir::setCurrent(testDataDir + "/wildcards-and-rules"); -- cgit v1.2.3