diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-26 17:18:38 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-26 18:18:11 +0000 |
| commit | 069f1b3709ed7df3aa9bd473d66f47d4469e14af (patch) | |
| tree | 350f4b3c9f492d8872b2f76251d87200f8f7676f | |
| parent | 112fa3d4c269faac41685d0de497afa9ba2b9621 (diff) | |
| download | qbs-069f1b3709ed7df3aa9bd473d66f47d4469e14af.tar.gz | |
Fix android autotest on Windows
We failed to account for the carriage returns in the jar output.
Change-Id: I2061a8ea306c64ce44039472f2840f71898c2097
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index b66c484e8..b47894234 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -117,6 +117,8 @@ void TestBlackboxAndroid::android() QVERIFY2(jar.waitForFinished(), qPrintable(jar.errorString())); QVERIFY2(jar.exitCode() == 0, qPrintable(jar.readAllStandardError().constData())); QByteArrayList actualFiles = jar.readAllStandardOutput().trimmed().split('\n'); + for (QByteArray &f : actualFiles) + f = f.trimmed(); QByteArrayList missingExpectedFiles; QByteArrayList expectedFiles = currentExpectedFilesLists.takeFirst(); for (const QByteArray &expectedFile : expectedFiles) { |