Mercurial > vim
changeset 35659:a60216ed43bd v9.1.0570
patch 9.1.0570: tests: test_gettext_make can be improved
Commit: https://github.com/vim/vim/commit/8a7563bbea331949117f605ec6076ac1bc9112ee
Author: Ken Takata <kentkt@csc.jp>
Date: Fri Jul 12 07:35:36 2024 +0200
patch 9.1.0570: tests: test_gettext_make can be improved
Problem: tests: test_gettext_make can be improved
(after v9.1.0559)
Solution: Improve the test
(Ken Takata)
* Remove unnecessary comment.
* Check the gettext feature.
* Check whether %GETTEXT_PATH% is set.
* Check the return code of the make command.
* Use heredoc.
closes: #15221
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 12 Jul 2024 07:45:11 +0200 |
| parents | 699afc981962 |
| children | 7567810b6b92 |
| files | src/testdir/test_gettext_make.vim src/version.c |
| diffstat | 2 files changed, 45 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_gettext_make.vim +++ b/src/testdir/test_gettext_make.vim @@ -1,11 +1,14 @@ source check.vim -"CheckNotMSWindows CheckNotMac +CheckFeature gettext " Test for package translation Makefile func Test_gettext_makefile() cd ../po if has('win32') + if getenv('GETTEXT_PATH') == '' + throw 'Skipped: %GETTEXT_PATH% is not set.' + endif call system('nmake.exe -f Make_mvc.mak "VIMPROG=' .. getenv('VIMPROG') .. \ '" "GETTEXT_PATH=' .. getenv('GETTEXT_PATH') .. \ '" PLUGPACKAGE=test_gettext @@ -21,41 +24,45 @@ func Test_gettext_makefile() \ ../testdir/test_gettext_makefile_in3.vim \ ../testdir/test_gettext_makefile_in4.vim\" test_gettext.pot") endif - let expected = [ - \ '# SOME DESCRIPTIVE TITLE.', - \ '# Copyright (C) YEAR THE PACKAGE''S COPYRIGHT HOLDER', - \ '# This file is distributed under the same license as the test_gettext package.', - \ '# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.', - \ '#', - \ '#, fuzzy', - \ 'msgid ""', - \ 'msgstr ""', - \ '"Project-Id-Version: test_gettext\n"', - \ '"Report-Msgid-Bugs-To: \n"', - \ '"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"', - \ '"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"', - \ '"Language-Team: LANGUAGE <LL@li.org>\n"', - \ '"Language: \n"', - \ '"MIME-Version: 1.0\n"', - \ '"Content-Type: text/plain; charset=CHARSET\n"', - \ '"Content-Transfer-Encoding: 8bit\n"', - \ '', - \ '#: ../testdir/test_gettext_makefile_in1.vim:4 ../testdir/test_gettext_makefile_in1.vim:6', - \ '#: ../testdir/test_gettext_makefile_in2.vim:5 ../testdir/test_gettext_makefile_in4.vim:4', - \ 'msgid "This is a test"', - \ 'msgstr ""', - \ '', - \ '#: ../testdir/test_gettext_makefile_in1.vim:5', - \ 'msgid "This is another test"', - \ 'msgstr ""', - \ '', - \ '#: ../testdir/test_gettext_makefile_in2.vim:4', - \ 'msgid "This is a test from the second file"', - \ 'msgstr ""', - \ '', - \ '#: ../testdir/test_gettext_makefile_in4.vim:5', - \ 'msgid "This is a fourth test"', - \ 'msgstr ""'] + if v:shell_error != 0 + throw 'Fail to create test_gettext.pot. Error code: ' .. v:shell_error + endif + let expected =<< trim END + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the test_gettext package. + # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. + # + #, fuzzy + msgid "" + msgstr "" + "Project-Id-Version: test_gettext\n" + "Report-Msgid-Bugs-To: \n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <LL@li.org>\n" + "Language: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=CHARSET\n" + "Content-Transfer-Encoding: 8bit\n" + + #: ../testdir/test_gettext_makefile_in1.vim:4 ../testdir/test_gettext_makefile_in1.vim:6 + #: ../testdir/test_gettext_makefile_in2.vim:5 ../testdir/test_gettext_makefile_in4.vim:4 + msgid "This is a test" + msgstr "" + + #: ../testdir/test_gettext_makefile_in1.vim:5 + msgid "This is another test" + msgstr "" + + #: ../testdir/test_gettext_makefile_in2.vim:4 + msgid "This is a test from the second file" + msgstr "" + + #: ../testdir/test_gettext_makefile_in4.vim:5 + msgid "This is a fourth test" + msgstr "" + END let potfile = filter(readfile("test_gettext.pot"), 'v:val !~ "POT-Creation-Date"') call assert_equal(expected, potfile) call delete('test_gettext.pot')