[gtk-doc] tests: directly build the integration test modules



commit b5e8087b420525bd6d86dee2653afda2fa0851db
Author: Stefan Sauer <ensonic users sf net>
Date:   Sun May 6 21:46:54 2018 +0200

    tests: directly build the integration test modules
    
    Instead of building the via automakes SUBDIR features, call make from
    gtkdoctest.sh. This is isolating the automake dependency a little.

 tests/Makefile.am   |   13 ++-----------
 tests/gtkdoctest.sh |    2 ++
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9172844..ba88529 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,11 @@
 ## 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 .
-
 if BUILD_TESTS
 
 TESTS = \
   check.py common.py mk_to_db.py mkhtml2.py \
-  tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh \
-  program.sh
+  tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh program.sh \
+  sanity.sh
 TESTS_ENVIRONMENT = \
        BUILDDIR=$(abs_builddir) \
        SRCDIR=$(abs_srcdir) \
@@ -24,11 +20,6 @@ endif
 
 EXTRA_DIST = gtkdoctest.sh $(TESTS)
 
-# run any given test by running make <test>.check
-%.check: %
-       @$(TESTS_ENVIRONMENT)   \
-       ./$*
-
 snapshot:
        @for dir in $(SUBDIRS); do \
     rm -rf $$dir/docs/html.ref; \
diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh
index cf52bd9..db31cb6 100755
--- a/tests/gtkdoctest.sh
+++ b/tests/gtkdoctest.sh
@@ -3,5 +3,7 @@
 suite=$1
 dir=`dirname $0`
 
+make -C $dir/$suite/docs/ clean check
+
 cd $dir/$suite/docs && \
 env BUILDDIR=$BUILDDIR/$suite/docs SRCDIR=$SRCDIR/$suite/docs gtkdoc-check


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]