tamer: Integrate into normal build process

Rust is now expected to be installed in the base image.

.gitlab-ci.yml

@@ -12,23 +12,12 @@ build:
         - export SAXON_CP=/usr/share/ant/lib/saxon9/saxon9he.jar
         - autoreconf -fvi
         - ./configure
+        - ( cd tamer && ./bootstrap && ./configure )
         - ( cd progtest && npm install && ./autogen.sh && ./configure )
         - make all check info pdf html
     artifacts:
         paths:
             - doc/
-        expire_in: 30 min
-
-build-rust:
-    stage: build
-    image: rust:1.39
-    script:
-        - cd tamer
-        - ./bootstrap
-        - ./configure
-        - make check
-    artifacts:
-        paths:
             - tamer/target
         expire_in: 30 min
 

Makefile.am

@@ -16,7 +16,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-SUBDIRS = src/current/src doc progtest
+SUBDIRS = tamer src/current/src doc progtest
 
 path_src  = src
 path_test = test
@@ -50,7 +50,7 @@ applies: $(apply_dest)
 	    "$<" > "$@"
 
 test: check
-check: | applies
+check-am: | applies
 	for test in $(path_aux)/test/test-*; do ./$$test || exit 1; done
 	$(path_test)/runner
 

bootstrap

@@ -30,7 +30,7 @@ test "${1:-}" = -n || git submodule update --init --recursive
     && { which npm && npm install || true; } \
     && ./autogen.sh && ./configure
 ) \
-  && ( cd tamer && ./bootstrap && ./configure && make check ) \
+  && ( cd tamer && ./bootstrap && ./configure ) \
   && { test -e hoxsl || ln -s ../hoxsl; } \
   && autoreconf -fvi \
   && ./configure \