[Template merge] move some generate tests to core

m4/giella-macros.m4

@@ -88,7 +88,7 @@ AC_MSG_RESULT([$GIELLA_CORE])
 ###############################################################
 ### This is the version of the Giella Core that we require. ###
 ### UPDATE AS NEEDED.
-_giella_core_min_version=1.0.0
+_giella_core_min_version=1.0.1
 
 # GIELLA_CORE/GTCORE env. variable, required by the infrastructure to find scripts:
 AC_ARG_VAR([GIELLA_CORE], [directory for the Giella infra core scripts and other required resources])

src/fst/morphology/test/Makefile.am

@@ -4,24 +4,15 @@
 
 SUBDIRS=phonology
 
-TESTS_ENVIRONMENT = export GIELLA_CORE=$(GIELLA_CORE);
-
-######## Test targets: ###########
+######## Local test targets: ###########
 
 # List here (space separated) all test scripts that should be run
 # unconditionally:
-TESTS=tag_test.sh
+TESTS=
 
 # Add your shell scripts for running tests requiring only a generator:
-GENERATION_TESTS_IN=generate-adjective-lemmas.sh.in  \
-                    generate-noun-lemmas.sh.in       \
-                    generate-propernoun-lemmas.sh.in \
-                    generate-verb-lemmas.sh.in
-
-GENERATION_TESTS=generate-adjective-lemmas.sh \
-				 generate-noun-lemmas.sh \
-				 generate-propernoun-lemmas.sh \
-				 generate-verb-lemmas.sh
+GENERATION_TESTS_IN=
+GENERATION_TESTS=
 
 if WANT_GENERATION
 TESTS+=$(GENERATION_TESTS)
@@ -31,10 +22,6 @@ endif # WANT_GENERATION
 # be fixed *later*, but is not critical at the moment:
 XFAIL_TESTS=generate-propernoun-lemmas.sh
 
-# Make sure all tests scripts are included in the distributed tarballs:
-EXTRA_DIST=$(TESTS) $(GENERATION_TESTS_IN)
 
-####### Other targets: ###########
-clean-local:
-	-rm -f *.txt
 include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
+include $(top_srcdir)/../giella-core/am-shared/src-fst-morphology-test-include.am