diff options
Diffstat (limited to 'tests/auto/testlib/selftests')
| -rw-r--r-- | tests/auto/testlib/selftests/CMakeLists.txt | 130 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/catch_p_p.h | 8 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/crashes/tst_crashes.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/selftest.pro | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/selftests.pro | 2 |
5 files changed, 68 insertions, 76 deletions
diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt index 9dc85e556a..bce68a37d8 100644 --- a/tests/auto/testlib/selftests/CMakeLists.txt +++ b/tests/auto/testlib/selftests/CMakeLists.txt @@ -52,7 +52,7 @@ qt_add_resource(tst_selftests "qmake_expected_files" ## Scopes: ##################################################################### -#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS): +#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS): # TEST_HELPER_INSTALLS = "../$${file}/$${file}" #### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui: @@ -63,71 +63,69 @@ qt_apply_testlib_coverage_options(tst_selftests) # ------------- Sub tests ------------- # special case begin -if(NOT WINRT) - set(subprograms - assert - badxml - benchlibcallgrind - benchlibcounting - benchlibeventcounter - benchliboptions - benchlibtickcounter - benchlibwalltime - blacklisted - cmptest - commandlinedata - counting - crashes - datatable - datetime - deleteLater - deleteLater_noApp - differentexec - exceptionthrow - expectfail - failcleanup - faildatatype - failfetchtype - failinit - failinitdata - fetchbogus - findtestdata - float - globaldata - longstring - maxwarnings - multiexec - pass - pairdiagnostics - printdatatags - printdatatagswithglobaltags - qexecstringlist - silent - signaldumper - singleskip - skip - skipcleanup - skipinit - skipinitdata - sleep - strcmp - subtest - testlib - tuplediagnostics - verbose1 - verbose2 - verifyexceptionthrown - warnings - watchdog - xunit - ) +set(subprograms + assert + badxml + benchlibcallgrind + benchlibcounting + benchlibeventcounter + benchliboptions + benchlibtickcounter + benchlibwalltime + blacklisted + cmptest + commandlinedata + counting + crashes + datatable + datetime + deleteLater + deleteLater_noApp + differentexec + exceptionthrow + expectfail + failcleanup + faildatatype + failfetchtype + failinit + failinitdata + fetchbogus + findtestdata + float + globaldata + longstring + maxwarnings + multiexec + pass + pairdiagnostics + printdatatags + printdatatagswithglobaltags + qexecstringlist + silent + signaldumper + singleskip + skip + skipcleanup + skipinit + skipinitdata + sleep + strcmp + subtest + testlib + tuplediagnostics + verbose1 + verbose2 + verifyexceptionthrown + warnings + watchdog + xunit +) - if(TARGET Qt::Gui) - list(APPEND subprograms - keyboard - mouse - ) - endif() +if(TARGET Qt::Gui) + list(APPEND subprograms + keyboard + mouse + ) endif() foreach(subprogram IN LISTS subprograms) @@ -149,6 +147,6 @@ qt_extend_target(tst_selftests ## Scopes: ##################################################################### -#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS): +#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS): # TEST_HELPER_INSTALLS = "../$${file}/$${file}" # special case end diff --git a/tests/auto/testlib/selftests/catch_p_p.h b/tests/auto/testlib/selftests/catch_p_p.h index ffc10559aa..97ce7a24fd 100644 --- a/tests/auto/testlib/selftests/catch_p_p.h +++ b/tests/auto/testlib/selftests/catch_p_p.h @@ -235,13 +235,7 @@ namespace Catch { # define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS # endif -// Universal Windows platform does not support SEH -// Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define CATCH_CONFIG_COLOUR_NONE -# else -# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -# endif +# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH // MSVC traditional preprocessor needs some workaround for __VA_ARGS__ // _MSVC_TRADITIONAL == 0 means new conformant preprocessor diff --git a/tests/auto/testlib/selftests/crashes/tst_crashes.cpp b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp index 87b241f5e5..4c418cc78f 100644 --- a/tests/auto/testlib/selftests/crashes/tst_crashes.cpp +++ b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp @@ -44,7 +44,7 @@ private slots: void tst_Crashes::crash() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) //we avoid the error dialogbox to appear on windows SetErrorMode( SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #endif diff --git a/tests/auto/testlib/selftests/selftest.pro b/tests/auto/testlib/selftests/selftest.pro index bcf96c9cb3..4d926d3572 100644 --- a/tests/auto/testlib/selftests/selftest.pro +++ b/tests/auto/testlib/selftests/selftest.pro @@ -18,6 +18,6 @@ RESOURCES += expected_files include(selftests.pri) DEFINES += SUBPROGRAMS=$$shell_quote($$SUBPROGRAMS) -!android:!winrt: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "$${file}/$${file}" +!android: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "$${file}/$${file}" include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro index 235967ebe9..cb71ff4833 100644 --- a/tests/auto/testlib/selftests/selftests.pro +++ b/tests/auto/testlib/selftests/selftests.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -!winrt: include(selftests.pri) +include(selftests.pri) selftest.file = selftest.pro selftest.makefile = Makefile.selftest |