diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-21 13:27:50 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-22 09:02:35 +0000 |
commit | 1e5ac8c491381f2ef70df6383407e9cbe226b4b9 (patch) | |
tree | e841dcf231ae7ef3ba4584bf8de91fcd594905b9 /tests/auto/quick/qmltests/tst_qmltests.cpp | |
parent | ac5a6f9ed06b98aa63981dd5d30e0febf36010d8 (diff) |
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 <alexandru.croitor@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tests/auto/quick/qmltests/tst_qmltests.cpp')
-rw-r--r-- | tests/auto/quick/qmltests/tst_qmltests.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |