diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 7679a8a..a84de3d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /anthy-unicode-1.0.0.20191015.tar.gz /anthy-unicode-1.0.0.20201109.tar.gz /anthy-unicode-1.0.0.20211224.tar.gz -/anthy-unicode-1.0.0.20240502.tar.gz diff --git a/anthy-unicode-1.0.0.20240502.tar.gz.sum b/anthy-unicode-1.0.0.20240502.tar.gz.sum deleted file mode 100644 index 5cf1eac..0000000 --- a/anthy-unicode-1.0.0.20240502.tar.gz.sum +++ /dev/null @@ -1,4 +0,0 @@ -cksum 2650323057 5196128 anthy-unicode-1.0.0.20240502.tar.gz -sha1sum 18c885dc0821ec675bee95e138ac7acd88ff3a3a anthy-unicode-1.0.0.20240502.tar.gz -sha256sum 43a13f24cc4749a1248bc6d0ce7796743b176ae68ee524cb4331bef64ac133b0 anthy-unicode-1.0.0.20240502.tar.gz -sha512sum 835f7cbd5c3afc3dcd7002b77c94a5c69e67f970584c223b47329ece011148cbc4e9f65332c00bbdbe2f407a2daa7f9e10067a182a27d07074e0f1406bb3bbc2 anthy-unicode-1.0.0.20240502.tar.gz diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch index 216e20c..a8c13a4 100644 --- a/anthy-unicode-HEAD.patch +++ b/anthy-unicode-HEAD.patch @@ -1,108 +1,147 @@ -From a4a42a3c933a2f40023e6c857e60e0bf08a1d913 Mon Sep 17 00:00:00 2001 +From d9355d3e0fac58eab16684fed2715cc91f68d39e Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Mon, 15 Jul 2024 14:53:17 +0900 -Subject: [PATCH] Fix some compiler warnings +Date: Fri, 11 Feb 2022 10:28:18 +0900 +Subject: [PATCH] src-util: set-face-underline is not available in xemacs Lisp -- src-main/context.c: Fix warning[-Waddress] - &ce->str will always evaluate as 'true' -- mkworddic/mkdic.c: Fix warning[-Wformat-overflow=] - '%s' directive argument is null --- - mkworddic/mkdic.c | 21 +++++++++------------ - src-main/context.c | 5 ++--- - 2 files changed, 11 insertions(+), 15 deletions(-) + src-util/anthy-unicode.el | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/mkworddic/mkdic.c b/mkworddic/mkdic.c -index b0f9f4c..cb68520 100644 ---- a/mkworddic/mkdic.c -+++ b/mkworddic/mkdic.c -@@ -60,8 +60,6 @@ +diff --git a/src-util/anthy-unicode.el b/src-util/anthy-unicode.el +index 14a9db4..902c7ac 100644 +--- a/src-util/anthy-unicode.el ++++ b/src-util/anthy-unicode.el +@@ -74,7 +74,8 @@ + (defvar anthy-highlight-face nil) + (defvar anthy-underline-face nil) + (copy-face 'highlight 'anthy-highlight-face) +-(set-face-underline 'anthy-highlight-face t) ++(if (not (featurep 'xemacs)) ++ (set-face-underline 'anthy-highlight-face t)) + (copy-face 'underline 'anthy-underline-face) - #define DEFAULT_FN "anthy.wdic" - --static const char *progname; -- - /* writewords.cからアクセスするために、global変数 */ - FILE *yomi_entry_index_out, *yomi_entry_out; - FILE *page_out, *page_index_out; -@@ -127,8 +125,7 @@ open_output_files(void) - } - /**/ - if (!(*(fs->fpp))) { -- fprintf (stderr, "%s: cannot open temporary file: %s\n", -- progname, strerror (errno)); -+ fprintf (stderr, "cannot open temporary file: %s\n", strerror (errno)); - exit (2); - } - } -@@ -142,13 +139,13 @@ flush_output_files (void) - struct file_section *fs; - for (fs = file_array; fs->fpp; fs ++) { - if (ferror(*(fs->fpp))) { -- fprintf (stderr, "%s: write error\n", progname); -+ fprintf (stderr, "write error\n"); - exit (1); - } - } - for (fs = file_array; fs->fpp; fs ++) { - if (fflush(*(fs->fpp))) { -- fprintf (stderr, "%s: write error: %s\n", progname, strerror (errno)); -+ fprintf (stderr, "write error: %s\n", strerror (errno)); - exit (1); - } - } -@@ -793,8 +790,8 @@ copy_file(struct mkdic_stat *mds, FILE *in, FILE *out) - while ((nread = fread (buf, 1, sizeof buf, in)) > 0) { - if (fwrite (buf, 1, nread, out) < nread) { - /* Handle short write (maybe disk full). */ -- fprintf (stderr, "%s: %s: write error: %s\n", -- progname, mds->output_fn, strerror (errno)); -+ fprintf (stderr, "%s: write error: %s\n", -+ mds->output_fn, strerror (errno)); - exit (1); - } - } -@@ -839,8 +836,8 @@ link_dics(struct mkdic_stat *mds) - - fp = fopen (mds->output_fn, "w"); - if (!fp) { -- fprintf (stderr, "%s: %s: cannot create: %s\n", -- progname, mds->output_fn, strerror (errno)); -+ fprintf (stderr, "%s: cannot create: %s\n", -+ mds->output_fn, strerror (errno)); - exit (1); - } - -@@ -856,8 +853,8 @@ link_dics(struct mkdic_stat *mds) - } - - if (fclose (fp)) { -- fprintf (stderr, "%s: %s: write error: %s\n", -- progname, mds->output_fn, strerror (errno)); -+ fprintf (stderr, "%s: write error: %s\n", -+ mds->output_fn, strerror (errno)); - exit (1); - } - } + ;; +-- +2.33.1 + +From 255323305b3621286cc4025ac59fa7d37fa1e7ce Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 6 May 2022 20:33:47 +0900 +Subject: [PATCH] src-main/context.c: Code reviews + +--- + src-main/context.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + diff --git a/src-main/context.c b/src-main/context.c -index d84858c..f117f7d 100644 +index 20dde71..d84858c 100644 --- a/src-main/context.c +++ b/src-main/context.c -@@ -706,12 +706,11 @@ anthy_do_print_context(struct anthy_context *ac, int encoding) - void - anthy_release_cand_ent(struct cand_ent *ce) - { -+ assert (ce); - if (ce->elm) { - free(ce->elm); +@@ -451,7 +451,7 @@ anthy_get_nth_segment(struct segment_list *sl, int n) + n < 0) { + return NULL; } -- if (&ce->str) { -- anthy_free_xstr_str(&ce->str); -- } -+ anthy_free_xstr_str(&ce->str); - free(ce); +- for (i = 0, se = sl->list_head.next; i < n; i++, se = se->next); ++ for (i = 0, se = sl->list_head.next; (i < n) && se; i++, se = se->next); + return se; } +@@ -499,6 +499,17 @@ get_change_state(struct anthy_context *ac) + int i; + for (i = 0; i < ac->seg_list.nr_segments; i++) { + struct seg_ent *s = anthy_get_nth_segment(&ac->seg_list, i); ++ if (!ac->split_info.ce) { ++ anthy_log(0, "ac->split_info.ce is NULL %s:%d\n", __FILE__, __LINE__); ++ resize = 1; ++ break; ++ } ++ if (!s) { ++ anthy_log(0, "ac->seg_list %dth entry is NULL %s:%d\n", ++ i, __FILE__, __LINE__); ++ resize = 1; ++ continue; ++ } + if (ac->split_info.ce[s->from].initial_seg_len != s->len) { + resize = 1; + } +@@ -538,6 +549,11 @@ write_history(int fd, + struct seg_ent *s = anthy_get_nth_segment(&ac->seg_list, i); + char *c; + /**/ ++ if (!s) { ++ anthy_log(0, "ac->seg_list %dth entry is NULL %s:%d\n", ++ i, __FILE__, __LINE__); ++ continue; ++ } + if (s->committed < 0) { + dprintf(fd, "?|"); + continue ; +@@ -647,9 +663,11 @@ print_segment(struct seg_ent *e) + { + int i; + ++ assert(e); + anthy_putxstr(&e->str); + printf("("); + for ( i = 0 ; i < e->nr_cands ; i++) { ++ assert(e->cands); + anthy_print_candidate(e->cands[i]); + printf(","); + } -- -2.45.0 +2.35.1 + +From 754f1c8b18ce0bf9c5e25541f4f4707d8a982811 Mon Sep 17 00:00:00 2001 +From: Jens Petersen +Date: Thu, 9 Jun 2022 11:47:18 +0800 +Subject: [PATCH] word_dic.c: rename master_dic_file to main_dic_file + +--- + src-worddic/word_dic.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src-worddic/word_dic.c b/src-worddic/word_dic.c +index cc2cf89..0138d17 100644 +--- a/src-worddic/word_dic.c ++++ b/src-worddic/word_dic.c +@@ -46,7 +46,7 @@ static int dic_init_count; + + /* 辞書 */ + /* 全personalityで共有されるファイル辞書 */ +-static struct word_dic *master_dic_file; ++static struct word_dic *main_dic_file; + + /* 各パーソナリティごとの辞書 */ + struct mem_dic *anthy_current_personal_dic_cache;/* キャッシュ */ +@@ -89,7 +89,7 @@ anthy_cache_get_seq_ent(xstr *xs, int is_reverse) + int + anthy_dic_check_word_relation(int from, int to) + { +- return anthy_word_dic_check_word_relation(master_dic_file, from, to); ++ return anthy_word_dic_check_word_relation(main_dic_file, from, to); + } + + static seq_ent_t +@@ -349,7 +349,7 @@ do_gang_load_dic(xstr *sentence, int is_reverse) + } + qsort(array, nr, sizeof(struct gang_elm *), gang_elm_compare_func); + /**/ +- anthy_gang_fill_seq_ent(master_dic_file, array, nr, is_reverse); ++ anthy_gang_fill_seq_ent(main_dic_file, array, nr, is_reverse); + /**/ + scan_misc_dic(array, nr, is_reverse); + /* 個人辞書から読む */ +@@ -769,8 +769,8 @@ anthy_init_dic(void) + anthy_init_features(); + + anthy_init_word_dic(); +- master_dic_file = anthy_create_word_dic(); +- if (!master_dic_file) { ++ main_dic_file = anthy_create_word_dic(); ++ if (!main_dic_file) { + anthy_log(0, "Failed to create file dic.\n"); + return -1; + } +-- +2.35.3 diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 587d7f2..774af13 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -9,10 +9,10 @@ Name: anthy-unicode -Version: 1.0.0.20240502 -Release: %autorelease +Version: 1.0.0.20211224 +Release: 7%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain. -License: LGPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain +License: LGPLv2+ and GPLv2 and Public Domain URL: https://github.com/fujiwarat/anthy-unicode/wiki BuildRequires: emacs BuildRequires: gcc @@ -30,8 +30,7 @@ BuildRequires: make %endif Source0: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version}/%{name}-%{version}.tar.gz.sum -Source2: %{name}-init.el +Source1: %{name}-init.el # Upstreamed patches #Patch0: %%{name}-HEAD.patch Patch0: %{name}-HEAD.patch @@ -48,7 +47,7 @@ other conversion server. %package -n emacs-%{pkg} Summary: Emacs files for %{pkg} Requires: %{name} = %{version}-%{release} -Requires: emacs-filesystem >= %{_emacs_version} +Requires: emacs(bin) >= %{_emacs_version} BuildArch: noarch %description -n emacs-%{pkg} @@ -59,7 +58,7 @@ with GNU Emacs. %package -n xemacs-%{pkg} Summary: XEmacs files for %{pkg} Requires: %{name} = %{version}-%{release} -Requires: xemacs-filesystem >= %{_xemacs_version} +Requires: xemacs(bin) >= %{_xemacs_version} BuildArch: noarch %description -n xemacs-%{pkg} @@ -77,11 +76,6 @@ the programs which uses Anthy Unicode. %prep -SAVED_SUM=$(grep sha512sum %SOURCE1 | awk '{print $2}') -MY_SUM=$(sha512sum %SOURCE0 | awk '{print $1}') -if test x"$SAVED_SUM" != x"$MY_SUM" ; then - abort -fi %autosetup -S git %build @@ -97,21 +91,16 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove unnecessary files rm $RPM_BUILD_ROOT%{_libdir}/lib*.la -pushd ./src-util -install -m 644 dic-tool-input $RPM_BUILD_ROOT%{_datadir}/%{pkg} -install -m 644 dic-tool-result $RPM_BUILD_ROOT%{_datadir}/%{pkg} -popd - ## for emacs-anthy mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir} %if %{with xemacs} ## for xemacs-anthy mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_xemacs_sitestartdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir} # FIXME lisp build -pushd ./src-util +pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean #make EMACS=xemacs lispdir="%%{_xemacs_sitelispdir}/%%{pkg}" # The latest /usr/share/automake-*/am/lisp.am calls -L option for @@ -173,13 +162,82 @@ cd .. %files devel %doc doc/DICLIB doc/DICUTIL doc/GLOSSARY doc/GRAMMAR doc/GUIDE.english doc/ILIB doc/LEARNING doc/LIB doc/MISC doc/POS doc/SPLITTER doc/TESTING doc/protocol.txt -%{_datadir}/%{pkg}/dic-tool-input -%{_datadir}/%{pkg}/dic-tool-result %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %changelog -%autochangelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.0.0.20211224-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Tue Jul 19 2022 Takao Fujiwara 1.0.0.20211224-6 +- Rename master_dic_file to main_dic_file + +* Fri May 06 2022 Takao Fujiwara 1.0.0.20211224-5 +- Fix GCC_ANALYZER_WARNING with -Wanalyzer-null-dereference + +* Fri Feb 11 2022 Takao Fujiwara 1.0.0.20211224-4 +- Resolves: #2051670 xemacs is a dead package + +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.0.20211224-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 24 2021 Takao Fujiwara 1.0.0.20211224-1 +- Bump to 1.0.0.20211224-1 + +* Tue Oct 26 2021 Takao Fujiwara 1.0.0.20201109-10 +- Resolves: #1998727 Fix emacs-anthy-unicode + +* Thu Oct 21 2021 Takao Fujiwara 1.0.0.20201109-8 +- Resolves: #2007482 Update gcanna.ctd with Shubitai + +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.0.20201109-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 13 2021 Takao Fujiwara 1.0.0.20201109-6 +- Fix covscan report + +* Mon Jul 12 2021 Takao Fujiwara 1.0.0.20201109-5 +- Fix covscan report + +* Mon May 03 2021 Takao Fujiwara 1.0.0.20201109-4 +- Delete unnecessary xemacs in tests/tests.yml + +* Sat May 01 2021 Takao Fujiwara 1.0.0.20201109-3 +- Enable CI + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.0.20201109-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 09 2020 Takao Fujiwara 1.0.0.20201109-1 +- Bump 1.0.0.20201109 + +* Fri Jul 31 2020 Fedora Release Engineering - 1.0.0.20191015-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0.20191015-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0.20191015-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 21 2019 Takao Fujiwara 1.0.0.20191015-2 +- Add %%check to run local test programs + +* Tue Oct 15 2019 Takao Fujiwara 1.0.0.20191015-1 +- Release anthy-unicode 1.0.0.20191015 + +* Wed Aug 07 2019 Takao Fujiwara 1.0.0.20190412-1 +- Initial package +- Update license +- Delete Group tags +- Make parse_modify_freq_command() for UTF-8 +- Revert ptab.h to EUC-JP +- BuildRequire: git +- Genearate emacs- and xemacs- sub packages +- Fix some obsolete warnings in emacs batch-byte-compile +- Fix shared-lib-calls-exit +- Fix non-conffile-in-etc +- Fix description-line-too-long diff --git a/changelog b/changelog deleted file mode 100644 index a67b8a6..0000000 --- a/changelog +++ /dev/null @@ -1,91 +0,0 @@ -* Thu Mar 14 2024 Takao Fujiwara 1.0.0.20211224-13 -- Resolves #2269401 Fix おきのえらぶ in gcanna.ctd - -* Mon Jan 22 2024 Fedora Release Engineering - 1.0.0.20211224-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.0.20211224-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.0.20211224-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.0.0.20211224-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 16 2022 Takao Fujiwara 1.0.0.20211224-8 -- Migrate license tag to SPDX - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.0.20211224-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Takao Fujiwara 1.0.0.20211224-6 -- Rename master_dic_file to main_dic_file - -* Fri May 06 2022 Takao Fujiwara 1.0.0.20211224-5 -- Fix GCC_ANALYZER_WARNING with -Wanalyzer-null-dereference - -* Fri Feb 11 2022 Takao Fujiwara 1.0.0.20211224-4 -- Resolves: #2051670 xemacs is a dead package - -* Wed Jan 19 2022 Fedora Release Engineering - 1.0.0.20211224-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Dec 24 2021 Takao Fujiwara 1.0.0.20211224-1 -- Bump to 1.0.0.20211224-1 - -* Tue Oct 26 2021 Takao Fujiwara 1.0.0.20201109-10 -- Resolves: #1998727 Fix emacs-anthy-unicode - -* Thu Oct 21 2021 Takao Fujiwara 1.0.0.20201109-8 -- Resolves: #2007482 Update gcanna.ctd with Shubitai - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.0.20201109-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 13 2021 Takao Fujiwara 1.0.0.20201109-6 -- Fix covscan report - -* Mon Jul 12 2021 Takao Fujiwara 1.0.0.20201109-5 -- Fix covscan report - -* Mon May 03 2021 Takao Fujiwara 1.0.0.20201109-4 -- Delete unnecessary xemacs in tests/tests.yml - -* Sat May 01 2021 Takao Fujiwara 1.0.0.20201109-3 -- Enable CI - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.0.20201109-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 09 2020 Takao Fujiwara 1.0.0.20201109-1 -- Bump 1.0.0.20201109 - -* Fri Jul 31 2020 Fedora Release Engineering - 1.0.0.20191015-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.0.20191015-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0.20191015-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Oct 21 2019 Takao Fujiwara 1.0.0.20191015-2 -- Add %%check to run local test programs - -* Tue Oct 15 2019 Takao Fujiwara 1.0.0.20191015-1 -- Release anthy-unicode 1.0.0.20191015 - -* Wed Aug 07 2019 Takao Fujiwara 1.0.0.20190412-1 -- Initial package -- Update license -- Delete Group tags -- Make parse_modify_freq_command() for UTF-8 -- Revert ptab.h to EUC-JP -- BuildRequire: git -- Genearate emacs- and xemacs- sub packages -- Fix some obsolete warnings in emacs batch-byte-compile -- Fix shared-lib-calls-exit -- Fix non-conffile-in-etc -- Fix description-line-too-long diff --git a/plans/dict-test.fmf b/plans/dict-test.fmf deleted file mode 100644 index 9c5ae63..0000000 --- a/plans/dict-test.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: anthy-unicode test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index b3ba7ad..019ac59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anthy-unicode-1.0.0.20240502.tar.gz) = 835f7cbd5c3afc3dcd7002b77c94a5c69e67f970584c223b47329ece011148cbc4e9f65332c00bbdbe2f407a2daa7f9e10067a182a27d07074e0f1406bb3bbc2 +SHA512 (anthy-unicode-1.0.0.20211224.tar.gz) = 8971129df716b4cb21c5c9fb24a98388381d8172004126f68c037d47721b0fd9ab9cb0b6ef73414e62bf9d832c59f09743546da72366c7692bfd146a05bf800d diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf deleted file mode 100644 index bc2c7a7..0000000 --- a/tests/migration/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Migration tests of private dicts from anthy to anthy-unicode -test: ./test.sh -framework: beakerlib -require: - - anthy-unicode-devel diff --git a/tests/migration/test.sh b/tests/migration/test.sh deleted file mode 100755 index a1bd50c..0000000 --- a/tests/migration/test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -[ -d $HOME/.anthy ] || mkdir $HOME/.anthy - -rlJournalStart - rlPhaseStartTest - rlRun -t "anthy-dic-tool-unicode --load /usr/share/anthy-unicode/dic-tool-input" - rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result" - rlRun -t "anthy-dic-tool-unicode --dump" - rlRun -t "mv $HOME/.config/anthy/private_words_default $HOME/.anthy" - rlRun -t "anthy-dic-tool-unicode --migrate" - rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result" - rlPhaseEnd -rlJournalEnd diff --git a/tests/tests.sh b/tests/tests.sh new file mode 100755 index 0000000..9d18fcd --- /dev/null +++ b/tests/tests.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +: ${SRCDIR:='./source'} + +anthy-dic-tool-unicode --load $SRCDIR/src-util/dic-tool-input +diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result +anthy-dic-tool-unicode --dump +[ -d $HOME/.anthy ] || mkdir $HOME/.anthy +mv $HOME/.config/anthy/private_words_default $HOME/.anthy +anthy-dic-tool-unicode --migrate +diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result + diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..c5f451c --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,19 @@ +- hosts: localhost + tags: + - classic + roles: + - role: standard-test-source + required_packages: + - git + vars: + fetch_only: True + - role: standard-test-basic + #- role: standard-test-beakerlib + required_packages: + - bash + - anthy-unicode + tests: + - smoke1: + dir: . + run: ./tests.sh +