From 957842946ea659a3ce4fb4a12aefb0e47c87a797 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 23 Jul 2020 21:49:14 -0400 Subject: [PATCH 1/2] Skip tests for functions unsupported on WebKit2 --- tests/controls/webtest.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp index 82b5859786..43a4073437 100644 --- a/tests/controls/webtest.cpp +++ b/tests/controls/webtest.cpp @@ -123,6 +123,7 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]") CHECK(m_browser->CanGoForward()); } +#if !wxUSE_WEBVIEW_WEBKIT2 SECTION("HistoryEnable") { LoadUrl(); @@ -136,7 +137,9 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]") CHECK(!m_browser->CanGoForward()); CHECK(!m_browser->CanGoBack()); } +#endif +#if !wxUSE_WEBVIEW_WEBKIT2 SECTION("HistoryClear") { LoadUrl(2); @@ -153,6 +156,7 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]") CHECK(!m_browser->CanGoForward()); CHECK(!m_browser->CanGoBack()); } +#endif SECTION("HistoryList") { From 64b7406ededb2412aef90be8702ec6293c7d203b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 23 Jul 2020 21:52:45 -0400 Subject: [PATCH 2/2] Re-enable webview on GTK3 Travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f993620c6e..03f6931c3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ jobs: name: wxGTK 2 UTF-8 Ubuntu 18.04 - dist: bionic compiler: gcc - env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl --disable-webview" wxMAKEFILE_CXXFLAGS=-std=c++11 wxMAKEFILE_LDFLAGS=-Wl,--no-as-needed wxUSE_XVFB=1 + env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_CXXFLAGS=-std=c++11 wxMAKEFILE_LDFLAGS=-Wl,--no-as-needed wxUSE_XVFB=1 name: wxGTK 3 STL Ubuntu 18.04 - dist: bionic compiler: clang