diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /tests/auto/testlib/selftests/silent | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'tests/auto/testlib/selftests/silent')
| -rw-r--r-- | tests/auto/testlib/selftests/silent/tst_silent.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp index cf3c35dec4..7d64efffa2 100644 --- a/tests/auto/testlib/selftests/silent/tst_silent.cpp +++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp @@ -77,7 +77,7 @@ void tst_Silent::xpass() #include <setjmp.h> static jmp_buf state; -static void abort_handler(int signal) +static void abort_handler(int) { longjmp(state, 1); } @@ -102,5 +102,14 @@ void tst_Silent::messages() qFatal("This is a fatal error message that should still appear in silent test output"); } -QTEST_MAIN(tst_Silent) +int main(int argc, char *argv[]) +{ + std::vector<const char*> args(argv, argv + argc); + args.push_back("-silent"); + argc = args.size(); + argv = const_cast<char**>(&args[0]); + + QTEST_MAIN_IMPL(tst_Silent) +} + #include "tst_silent.moc" |