[Template merge] fix lexicon path and rename

giellalt · Feb 17, 2025 · 5d1cdd9 · 5d1cdd9
1 parent fbbf722
commit 5d1cdd9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@
 /src/fst/filters/remove-all*.regex
 /src/fst/filters/remove-homonymy-tags.regex
 /src/fst/filters/remove-usage-tags.regex
+/src/fst/filters/remove-altorth-tags.regex
 /src/fst/generated_files/*.lexc
 /src/fst/morphology/*-error-log.txt
 /src/fst/morphology/*.tmp.*
@@ -80,6 +81,7 @@
 /src/fst/morphology/test/*.txt 
 /src/fst/morphology/test/filtered*
 /src/fst/morphology/test/generate-*-lemmas.sh
+/src/fst/morphology/test/missing-multichars.sh
 /src/fst/morphology/test/phonology/hfst-twolc-error-messages.txt
 /src/fst/morphology/test/phonology/negative-*.txt
 /src/fst/morphology/test/phonology/pair-*.txt

diff --git a/m4/giella-config-files.m4 b/m4/giella-config-files.m4
@@ -93,6 +93,9 @@ AC_CONFIG_FILES([src/fst/morphology/test/generate-propernoun-lemmas.sh], \
       [chmod a+x src/fst/morphology/test/generate-propernoun-lemmas.sh])
 AC_CONFIG_FILES([src/fst/morphology/test/generate-verb-lemmas.sh], \
       [chmod a+x src/fst/morphology/test/generate-verb-lemmas.sh])
+# Multichar symbol consistency
+AC_CONFIG_FILES([src/fst/morphology/test/missing-multichars.sh], \
+      [chmod a+x src/fst/morphology/test/missing-multichars.sh])
 # Lemma acceptance test for spellers, all languages:
 AC_CONFIG_FILES([tools/spellcheckers/test/fstbased/desktop/hfst/accept-all-lemmas.sh], \
       [chmod a+x tools/spellcheckers/test/fstbased/desktop/hfst/accept-all-lemmas.sh])

diff --git a/src/fst/morphology/test/Makefile.am b/src/fst/morphology/test/Makefile.am
@@ -24,7 +24,7 @@ XFAIL_TESTS=generate-adjective-lemmas.sh  \
             generate-noun-lemmas.sh       \
             generate-propernoun-lemmas.sh \
             generate-verb-lemmas.sh \
-			tag_test.sh
+			missing-multichars.sh
 
 
 include $(top_srcdir)/../giella-core/am-shared/devtest-include.am

diff --git a/src/fst/morphology/test/tag_test.sh → .../morphology/test/missing-multichars.sh.in b/src/fst/morphology/test/tag_test.sh → .../morphology/test/missing-multichars.sh.in
@@ -10,12 +10,12 @@ if test -z "$GIELLA_CORE" ; then
     exit 2
 fi
 relpath="$GIELLA_CORE/scripts/"
-testrunner="$relpath/tag_test.sh"
+testrunner="$relpath/missing-multichars.sh"
 if ! test -x "$testrunner" ; then
     echo "missing test runner in $testrunner"
     exit 77
 fi
-lexc=../lexicon.lexc
+lexc=@builddir@/../.generated/lexicon.lexc
 if ! test -f $lexc ; then
     echo combined $lexc missing or disappeared
     exit 1