[gjs] CI: enable more tests
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] CI: enable more tests
- Date: Thu, 9 Feb 2017 05:36:00 +0000 (UTC)
commit 558c939f8882e615835a8504c309ad1bcbb7efdf
Author: Claudio André <claudioandre br gmail com>
Date: Fri Jan 27 12:30:36 2017 -0200
CI: enable more tests
https://bugzilla.gnome.org/show_bug.cgi?id=776549
.travis.yml | 2 +-
test/travis-ci.sh | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.travis.yml b/.travis.yml
index 80cf9d9..122c55c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,5 +34,5 @@ before_script:
fi'
script:
- - docker run -v $(pwd):/cwd -v $(pwd)/gjs/test/travis-ci.sh:/travis-ci.sh -e "BASE=$BASE" -e "OS=$IMAGE"
-e "CC=$CCO" local/$NAME bash -e -c "/travis-ci.sh GJS"
+ - docker run -v $(pwd):/cwd -v $(pwd)/gjs/test/travis-ci.sh:/travis-ci.sh -e BASE=$BASE -e OS=$IMAGE -e
CC=$CCO local/$NAME bash -e -c "/travis-ci.sh GJS"
diff --git a/test/travis-ci.sh b/test/travis-ci.sh
index 0dfc288..c71da93 100755
--- a/test/travis-ci.sh
+++ b/test/travis-ci.sh
@@ -38,13 +38,15 @@ function do_Install_Dependencies(){
if [[ $BASE == "ubuntu" ]]; then
# Testing dependencies
- apt-get -y -qq install gir1.2-gtk-3.0 xvfb gnome-desktop-testing dbus-x11 dbus > /dev/null
+ apt-get -y -qq install libgtk-3-dev gir1.2-gtk-3.0 xvfb gnome-desktop-testing dbus-x11 dbus \
+ libreadline6 libreadline6-dev > /dev/null
elif [[ $BASE == "fedora" ]]; then
# Testing dependencies
- dnf -y -q install gtk3 gobject-introspection Xvfb gnome-desktop-testing dbus-x11 dbus \
+ dnf -y -q install gtk3 gtk3-devel gobject-introspection Xvfb gnome-desktop-testing dbus-x11 dbus \
cairo intltool libxslt bison nspr zlib python3-devel dbus-glib libicu libffi pcre
libxml2 libxslt libtool flex \
- cairo-devel zlib-devel libffi-devel pcre-devel libxml2-devel libxslt-devel
+ cairo-devel zlib-devel libffi-devel pcre-devel libxml2-devel libxslt-devel \
+ libedit libedit-devel
fi
}
@@ -106,9 +108,10 @@ function do_Configure_JHBuild(){
echo '-- Set JHBuild Configuration --'
mkdir -p ~/.config
+ autogenargs="--enable-compile-warnings=error --enable-installed-tests --with-xvfb-tests"
cat <<EOFILE >> ~/.config/jhbuildrc
-module_autogenargs['gjs'] = '--enable-compile-warnings=error --enable-installed-tests --with-xvfb-tests'
+module_autogenargs['gjs'] = "$autogenargs"
module_makeargs['gjs'] = '-s'
skip = ['gettext', 'yelp-xsl', 'yelp-tools', 'gtk-doc']
EOFILE
@@ -226,7 +229,7 @@ elif [[ $1 == "GJS" ]]; then
# Extra testing
echo
echo '-- Installed GJS tests --'
- jhbuild run dbus-run-session -- gnome-desktop-testing-runner gjs
+ xvfb-run jhbuild run dbus-run-session -- gnome-desktop-testing-runner gjs
else
echo
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]