thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0570: tests: test_gettext_make can be improved

Browse Source 
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>
This commit is contained in:
Ken Takata
2024-07-12 07:35:36 +02:00
committed by Christian Brabandt
parent 7347642633
commit 8a7563bbea
2 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/testdir/test_gettext_make.vim
View File

@@ -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')

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
570,
/**/
569,
/**/