[gtk-doc] Add glib to enable integration tests
- From: Stefan Sauer <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] Add glib to enable integration tests
- Date: Thu, 13 Dec 2018 21:22:21 +0000 (UTC)
commit a667a65136875ad57412c8ccb619cc4f3dab86ad
Author: Stefan Sauer <ensonic users sf net>
Date: Thu Dec 13 22:21:11 2018 +0100
Add glib to enable integration tests
But also update tests/Makefile to run unittests and only disable integration-
tests if no glib is installed.
.gitlab-ci.yml | 2 +-
tests/Makefile.am | 17 +++++++----------
2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e026fe..2f630a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: debian:unstable
before_script:
- apt update -qq
- apt install -y -qq autoconf automake build-essential libtool make pkg-config
- docbook-xsl libxml2-utils xsltproc
+ dblatex docbook-xsl libxml2-utils xsltproc libglib2.0-dev
python3-lxml python3-parameterized python3-pip
python3-pygments python3-unittest2
- export LANG=C.UTF-8
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9ddfb47..9ff892c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,14 @@
## Process this file with automake to produce Makefile.in
-# we need to run '.' last so that sanity processes the generated docs
-# maybe move it to a subdir?
-SUBDIRS = annotations bugs empty fail gobject program repro .
+SUBDIRS =
+TESTS = tools.sh check.py common.py mkdb.py mk_to_db.py mkhtml2.py scan.py
if BUILD_TESTS
-
-TESTS = \
- check.py common.py mkdb.py mk_to_db.py mkhtml2.py scan.py \
- tools.sh \
- annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh
+# we need to run '.' last so that sanity processes the generated docs
+# maybe move it to a subdir?
+SUBDIRS += annotations bugs empty fail gobject program repro .
+TESTS += annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh
+endif
TESTS_ENVIRONMENT = \
BUILDDIR=$(abs_builddir) \
@@ -23,8 +22,6 @@ TESTS_ENVIRONMENT = \
TEST_EXTENSIONS = .py
PY_LOG_COMPILER = $(PYTHON)
-endif
-
EXTRA_DIST = gtkdoctest.sh sanity.sh $(TESTS)
# run any given test by running make <test>.check
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]