diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-10-18 23:26:56 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-10-19 12:02:15 +0000 |
| commit | 4923b855ebecc2bf7505006174e03cc55107f4bc (patch) | |
| tree | 3aa20e051ea2bddb54de56c4af179f90dc0b1911 /tests/packagecreator/tst_packagecreator.cpp | |
| parent | 7542172bced772d5cf998883bd6d4fa130101650 (diff) | |
Windows fixes
1) 'true' is not a valid command in Window's cmd.exe
2) Avoid a crash on exit due to the ConsoleThread being killed
3) Fix warning in int -> void * conversion on 64bit builds
4) Win10 1803 now comes with a bsdtar in c:\windows that actually works,
but it returns windows-style \r\n line breaks
Change-Id: I0340ee3e5185298f5b0a5e7d7cf5e2ef57b8b9a3
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'tests/packagecreator/tst_packagecreator.cpp')
| -rw-r--r-- | tests/packagecreator/tst_packagecreator.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/packagecreator/tst_packagecreator.cpp b/tests/packagecreator/tst_packagecreator.cpp index 0e95489f..1c1f05ae 100644 --- a/tests/packagecreator/tst_packagecreator.cpp +++ b/tests/packagecreator/tst_packagecreator.cpp @@ -136,6 +136,9 @@ void tst_PackageCreator::createAndVerify() expectedContents.append(qSL("--PACKAGE-FOOTER--")); QStringList actualContents = QString::fromLocal8Bit(tar.readAllStandardOutput()).split(qL1C('\n'), QString::SkipEmptyParts); +#if defined(Q_OS_WIN) + actualContents.replaceInStrings(qSL("\r"), QString()); +#endif QCOMPARE(actualContents, expectedContents); // check the contents of the files |