From 1e5ac8c491381f2ef70df6383407e9cbe226b4b9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 21 Feb 2017 13:27:50 +0100 Subject: Catch terminating render process in file picker test These tests have been broken for some time but we didn't catch that the web-process self-terminated. This change ensures we catch it and adds the failing tests to the black list. It also fixes BLACKLIST support by following what QUICK_TEST_MAIN does. Change-Id: I31cc123e1d653f37e33ccb3a754b9fae8cfe02d6 Reviewed-by: Alexandru Croitor Reviewed-by: Peter Varga --- tests/auto/quick/qmltests/tst_qmltests.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/quick/qmltests/tst_qmltests.cpp') diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 6b5c4d00b..fa2f069f5 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -42,6 +42,10 @@ int main(int argc, char **argv) if (!QCoreApplication::instance()) app.reset(new Application(argc, argv)); QtWebEngine::initialize(); + + QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS + QTEST_SET_MAIN_SOURCE_PATH + int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR); return i; } -- cgit v1.2.3