diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-09-05 12:43:49 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2017-10-02 11:23:45 +0000 |
commit | 8faa8086e77059d5449f946e0bd0f78e61213a2a (patch) | |
tree | aefcfcc9a6db02fbd3b9652d5b3ccb4b0dbd906b /tests/postbuild/symbols/tst_symbols.cpp | |
parent | 416fc118fc5a2d9259a9c1a63768eb0f3516a873 (diff) |
Check if modules exists and skip bic and symbol tests
Run qmake to see if modules are compiled and installed.
If not skip the bic and symbol tests.
Task-number: QTBUG-63005
Change-Id: I7a0a21a3da395ea99ff467927a3284796835041b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/postbuild/symbols/tst_symbols.cpp')
-rw-r--r-- | tests/postbuild/symbols/tst_symbols.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/postbuild/symbols/tst_symbols.cpp b/tests/postbuild/symbols/tst_symbols.cpp index 7816254f..98766654 100644 --- a/tests/postbuild/symbols/tst_symbols.cpp +++ b/tests/postbuild/symbols/tst_symbols.cpp @@ -75,9 +75,11 @@ void tst_Symbols::initTestCase() ); } - modules = qt_tests_shared_global_get_modules(configFile); + QString workDir = qtModuleDir + QStringLiteral("/tests/global"); + modules = qt_tests_shared_global_get_modules(workDir, configFile); - QVERIFY2(modules.size() > 0, "Something is wrong in the global config file."); + if (!modules.size()) + QSKIP("No modules found."); qtLibDir = QLibraryInfo::location( QLibraryInfo::LibrariesPath ); QFileInfo qtLibDirInfo(qtLibDir); |