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 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") {