commit 4f3b25f14a7988bba6a9b6ccdab7e0cc513738c9
Author: Philip Chimento <philip endlessm com>
Date: Thu Aug 15 12:33:03 2019 -0700
CI: Fix WebKit example
We only have WebKit on the Ubuntu image, not the Fedora image. Now that
we have build_maximal running on the Fedora image, this test will no
longer work unless we install WebKit there too.
For the time being, skip the test if WebKit isn't available.
installed-tests/scripts/testExamples.sh | 8 ++++++--
test/extra/do_basic.sh | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/installed-tests/scripts/testExamples.sh b/installed-tests/scripts/testExamples.sh
index 7265f0e3..1d2c39e8 100755
--- a/installed-tests/scripts/testExamples.sh
+++ b/installed-tests/scripts/testExamples.sh
@@ -21,8 +21,12 @@ if [[ -n "${ENABLE_GTK}" ]]; then
eval timeout 5s $graphical_gjs examples/gettext.js
report_timeout "run the gettext.js example"
- eval timeout 15s $graphical_gjs examples/webkit.js
- report_timeout "run the webkit.js example"
+ if gjs -c 'imports.gi.WebKit2' >/dev/null 2>&1; then
+ eval timeout 15s $graphical_gjs examples/webkit.js
+ report_timeout "run the webkit.js example"
+ else
+ skip "run the webkit.js example" "WebKit2 not found"
+ fi
else
skip "run the calc.js example" "running without GTK"
skip "run the gtk.js example" "running without GTK"
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index 94b5b8eb..18c798a7 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -35,7 +35,8 @@ function do_Install_Dependencies(){
libxslt libtool flex \
cairo-devel zlib-devel libffi-devel pcre-devel libxml2-devel libxslt-devel \
libedit-devel libasan libubsan libtsan compiler-rt \
- sysprof-devel lcov mesa-libGL-devel readline-devel
+ sysprof-devel lcov mesa-libGL-devel readline-devel \
+ webkit2gtk3
if [[ $DEV == "devel" ]]; then
dnf -y install time