From 37bc11e707d3f29fa81675bcc41610ab65c2b314 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 28 Sep 2021 15:12:48 +0200 Subject: Refactor QTEST*_MAIN() implementations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The various variants duplicated some rather complex code around varying setup in the middle. Rework in terms of a macro that defines main() and takes the setup code as a parameter. That setup code also had some common structure, so package that in a setup macro that takes the class to be used. Reworked various testlib selftests that were using QTEST_MAIN_IMPL(); change to use the new QTEST_MAIN_WRAPPER() and TEST_MAIN_SETUP(). These might be better dealt with by supporting a second form of the initMain() test-setup function in the test classes, that takes references for argc and argv, to let a test massage its command-line options. Change-Id: I7fb16b38d51c80ba2f5c9c82f3b7a37ffc636795 Reviewed-by: Tor Arne Vestbø --- tests/auto/testlib/selftests/silent/tst_silent.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/auto/testlib/selftests/silent/tst_silent.cpp') diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp index 34b33e1391..87c610f269 100644 --- a/tests/auto/testlib/selftests/silent/tst_silent.cpp +++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -102,14 +102,11 @@ void tst_Silent::messages() qFatal("This is a fatal error message that should still appear in silent test output"); } -int main(int argc, char *argv[]) -{ +QTEST_MAIN_WRAPPER(tst_Silent, std::vector args(argv, argv + argc); args.push_back("-silent"); argc = int(args.size()); argv = const_cast(&args[0]); - - QTEST_MAIN_IMPL(tst_Silent) -} + QTEST_MAIN_SETUP()) #include "tst_silent.moc" -- cgit v1.2.3