Commit cd15d00d authored by Corentin Noël's avatar Corentin Noël

Use gsignond from Ubuntu PPA

parent 991e2f3c
Pipeline #20426225 canceled with stages
in 6 minutes and 57 seconds
image: ubuntu:xenial
image: ubuntu:bionic
cache:
key: apt-cache
......@@ -7,18 +7,16 @@ cache:
before_script:
- export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y autotools-dev gobject-introspection gtk-doc-tools libdbus-1-dev libgirepository1.0-dev libglib2.0-dev pkg-config valac python3 python3-gi python-gi-dev lcov gcovr check
- apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y libsqlite3-dev git # TODO Remove it once gsignond is mainlined in debian/ubuntu
- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y software-properties-common
- add-apt-repository ppa:accounts-sso-devs/daily
- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y meson gobject-introspection gtk-doc-tools libdbus-1-dev libgirepository1.0-dev libglib2.0-dev pkg-config valac python3 python3-gi python-gi-dev lcov gcovr check gsignond dbus-test-runner
build_amd64:
stage: build
script:
- export PYTHON=python3
- NOCONFIGURE=1 ./autogen.sh
- mkdir build
- meson build -Dbus_type=session -Dtests=true -Ddebug=true -Ddocumentation=true
- cd build
- ../configure --enable-gtk-doc --enable-introspection=yes --enable-tests --enable-python --enable-coverage
- make -j 4
- ninja
artifacts:
paths:
- ./
......@@ -26,18 +24,9 @@ build_amd64:
test_amd64:
stage: test
script:
### Remove this once gsignond is packaged into debian/ubuntu
- git clone https://gitlab.com/accounts-sso/gsignond.git
- cd gsignond
- ./autogen.sh --prefix=/usr
- make -j 4
- make install
- cd ..
### Remove down to here
- find build | xargs touch # Avoid rebuilding
- cd build
- make check || (cat tests/test-suite.log && /bin/false)
- make lcov
- ninja test
dependencies:
- build_amd64
artifacts:
......
......@@ -14,15 +14,17 @@ library_environment.set ('SSO_IDENTITY_TIMEOUT', '5')
library_environment.set ('SSO_AUTHSESSION_TIMEOUT', '5')
library_environment.set ('G_MESSAGES_DEBUG', 'all')
library_environment.set ('G_SLICE', 'debug-blocks')
library_environment.set ('TEST_APP', test_library.full_path())
dbus_test_runner = find_program('dbus-test-runner')
dbus_test_runner = find_program('signon-glib-test.sh')
test('test-library',
dbus_test_runner,
args: [
'-m', '180',
'-t', 'gsignond',
'-t', join_paths(meson.current_build_dir(), 'test-library'),
'-f', 'com.google.code.AccountsSSO.gSingleSignOn'
],
test_library,
#args: [
# '-m', '180',
# '-t', 'gsignond',
# '-t', join_paths(meson.current_build_dir(), 'test-library'),
# '-f', 'com.google.code.AccountsSSO.gSingleSignOn'
#],
env: library_environment
)
......@@ -12,8 +12,6 @@ export SSO_AUTHSESSION_TIMEOUT=5
export G_MESSAGES_DEBUG=all
export G_SLICE=debug-blocks
TEST_APP="$TESTDIR/signon-glib-test-wrapper.sh"
# If dbus-test-runner exists, use it to run the tests in a separate D-Bus
# session
if command -v dbus-test-runner > /dev/null ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment