aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2016-05-20 16:03:03 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-05-20 15:07:11 +0000
commit6f7eecf318256eb43e8c2fe26f9438db683fa52e (patch)
treed3b1f67fc992f33e90b263c41f760a2e7b1a9825
parente5d3ecb06b6c2b22d56a2101f33dd1aac7017d18 (diff)
Fix responseFiles autotest on non-Windows
Do not hard-code the shell-quoting. Change-Id: I4e7fafa28e0248581550a6467ce62f1c221d73c0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 2ea112b8e..c6e7aed51 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -37,6 +37,7 @@
#include <tools/installoptions.h>
#include <tools/profile.h>
#include <tools/settings.h>
+#include <tools/shellutils.h>
#include <tools/version.h>
#include <QLocale>
@@ -1748,7 +1749,8 @@ void TestBlackbox::responseFiles()
QCOMPARE(runQbs(params), 0);
QFile file("installed/response-file-content.txt");
QVERIFY(file.open(QIODevice::ReadOnly));
- const QList<QByteArray> expected = {"foo", "\"with space\"", "bar", ""};
+ const QList<QByteArray> expected = QList<QByteArray>()
+ << "foo" << qbs::Internal::shellQuote("with space").toUtf8() << "bar" << "";
QList<QByteArray> lines = file.readAll().split('\n');
for (int i = 0; i < lines.count(); ++i)
lines[i] = lines.at(i).trimmed();