diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a44b2b6fb4..fa6fefa267 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,7 +135,7 @@ jobs: - name: Ubuntu 18.04 wxQt runner: ubuntu-latest container: ubuntu:18.04 - configure_flags: --with-qt --enable-pch --without-opengl --disable-uiactionsim + configure_flags: --with-qt --enable-pch --without-opengl skip_samples: true use_xvfb: true @@ -370,6 +370,9 @@ jobs: wx_tests_selection='~[.] ~RichTextCtrlTestCase' fi + # The tests only work reliably with native windows + export QT_USE_NATIVE_WINDOWS=1 + # Configure the system to create core files and create them in the # current directory instead of using apport to handle them, as # Ubuntu does by default (even in a container where apport is not diff --git a/tests/test.cpp b/tests/test.cpp index e07c7118b4..1111b7cd30 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -524,11 +524,11 @@ bool EnableUITests() if ( s_enabled == -1 ) { -#if defined(__WXMSW__) || defined(__WXGTK__) +#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__) s_enabled = 1; -#else // !(__WXMSW__ || __WXGTK__) +#else // !(__WXMSW__ || __WXGTK__ || __WXQT__) s_enabled = 0; -#endif // (__WXMSW__ || __WXGTK__) +#endif // (__WXMSW__ || __WXGTK__ || __WXQT__) } }