diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-16 16:46:48 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-16 15:55:19 +0000 |
| commit | 871011aa97501d948c90250ec33ace9e0463702e (patch) | |
| tree | c69e4e59bd7da4a1b268ad450a363863b96e1d7f /tests | |
| parent | 054601df52cb3eb8d0cf52494672fffa382cc23f (diff) | |
Fix "generatedFilesList" API test with mingw
Change-Id: I2251d6b122aaf69a7145488c1ba0326c6e7dd2b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index cb53988bc..b0905ea46 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -1145,14 +1145,13 @@ void TestApi::generatedFilesList() QVERIFY(a.isGenerated()); QFileInfo fi(a.filePath()); using qbs::Internal::HostOsInfo; - const QString objSuffix = HostOsInfo::isWindowsHost() ? ".obj" : ".o"; - QVERIFY2(fi.fileName() == "main.cpp" + objSuffix - || fi.fileName() == "mainwindow.cpp" + objSuffix - || fi.fileName() == "moc_mainwindow.cpp" - || fi.fileName() == "moc_mainwindow.cpp" + objSuffix - || fi.fileName() == "ui_mainwindow.h" - || fi.fileName() == HostOsInfo::appendExecutableSuffix("generated-files-list") - || fi.fileName().endsWith(".plist"), + const QStringList possibleFileNames = QStringList() + << "main.cpp.o" << "main.cpp.obj" + << "mainwindow.cpp.o" << "mainwindow.cpp.obj" + << "moc_mainwindow.cpp" << "moc_mainwindow.cpp.o" << "moc_mainwindow.cpp.obj" + << "ui_mainwindow.h" + << HostOsInfo::appendExecutableSuffix("generated-files-list"); + QVERIFY2(possibleFileNames.contains(fi.fileName()) || fi.fileName().endsWith(".plist"), qPrintable(fi.fileName())); } foreach (const qbs::GroupData &group, product.groups()) { |