From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 38799@debbugs.gnu.org
Subject: [bug#38799] [PATCH v2] gnu: vim: Update to 8.2.0066.
Date: Tue, 31 Dec 2019 21:21:34 +0100 [thread overview]
Message-ID: <20191231202134.o7npk5xcw3w46fw5@zdrowyportier.kadziolka.net> (raw)
In-Reply-To: <20191229173405.gkwdnohqg3gim7m3@zdrowyportier.kadziolka.net>
Vim pushed some new commits that look desirable -- 8.2.0063 seems to
have fixed a crash -- so here's a new patch with a bumped version &
hash.
--- CUT HERE ---
* gnu/packages/vim.scm (vim): Update to 8.2.0066.
[arguments]: Work around new build-container-related test failures.
[native-inputs]: Add tzdata to make a test pass.
---
gnu/packages/vim.scm | 61 +++++++++++++++++++++++++++++++-------------
1 file changed, 43 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index b33fe42ceb..efbe625998 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -67,16 +67,16 @@
(define-public vim
(package
(name "vim")
- (version "8.1.0644")
+ (version "8.2.0066")
(source (origin
- (method git-fetch)
- (uri (git-reference
+ (method git-fetch)
+ (uri (git-reference
(url "https://github.com/vim/vim")
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xksb2v8rw1zgrd5fwqvrh44lf277k85sad2y4ia1z17y7i8j2fl"))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yrmbqfwyj2ri61ahgzrglznpy1p6f1ldqkazhyxpwl4azk4n7zx"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -92,26 +92,51 @@
"src/testdir/test_terminal.vim")
(("/bin/sh") (which "sh")))
#t))
+ (add-before 'check 'set-tzdir
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; One of the tests tests timezone-dependent functions.
+ (setenv "TZDIR"
+ (string-append (assoc-ref inputs "tzdata")
+ "/share/zoneinfo"))
+ #t))
(add-before 'check 'patch-failing-tests
(lambda _
- ;; XXX A single test fails with “Can't create file /dev/stdout” (at
- ;; Test_writefile_sync_dev_stdout line 5) while /dev/stdout exists.
- (substitute* "src/testdir/test_writefile.vim"
- (("/dev/stdout") "a-regular-file"))
+ ;; This test fails when run in the build container:
+ ;; When handling swap files, Vim needs to check whether a process
+ ;; with a specific PID exists. This is done with kill(pid, 0),
+ ;; which gives similar enough results when the process exists, but
+ ;; Vim does not have permission to send signals to it.
+ ;;
+ ;; This is used in the test by modifying a swap file to say
+ ;; it came from PID 1. This works in a normal environment, since
+ ;; PID 1 usually runs as root, and the test suite does not.
+ ;; The test even contains a check for running as root, since
+ ;; that's one of the situation where the test fails.
+ ;;
+ ;; However, in the build container, PID 1 isn't root, but the same
+ ;; user as the test suite itself. As such, we skip this test.
+ ;; An alternative approach would be to patch the PID used to a
+ ;; random 32-bit value and hope it never shows up in the test
+ ;; environment.
+ (substitute* "src/testdir/test_swap.vim"
+ (("if !IsRoot\\(\\)") "if 0"))
- ;; XXX: This test fails when run in the build container:
- ;; <https://github.com/vim/vim/issues/3348>.
- (substitute* "src/testdir/test_search.vim"
- ((".*'Test_incsearch_substitute_03'.*" all)
- (string-append "\"" all "\n")))
+ ;; This test checks how the terminal looks after executing some
+ ;; actions. The path of the bash binary is shown, which results in
+ ;; a difference being detected. Patching the expected result is
+ ;; non-trivial due to the special format used, so skip the test.
+ (substitute* "src/testdir/test_terminal.vim"
+ ((".*Test_terminal_postponed_scrollback.*" line)
+ (string-append line "return\n")))
#t)))))
(inputs
`(("gawk" ,gawk)
("ncurses" ,ncurses)
("perl" ,perl)
- ("tcsh" ,tcsh))) ; For runtime/tools/vim32
+ ("tcsh" ,tcsh))) ; For runtime/tools/vim32
(native-inputs
- `(("libtool" ,libtool)))
+ `(("libtool" ,libtool)
+ ("tzdata" ,tzdata-for-tests))) ; For Test_strftime in test_functions.vim
(home-page "https://www.vim.org/")
(synopsis "Text editor based on vi")
(description
--
2.24.1
next prev parent reply other threads:[~2019-12-31 20:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-29 17:34 [bug#38799] [PATCH] gnu: vim: Update to 8.2.0055 Jakub Kądziołka
2019-12-30 0:33 ` Tobias Geerinckx-Rice via Guix-patches via
2019-12-31 20:21 ` Jakub Kądziołka [this message]
2019-12-31 22:49 ` bug#38799: [PATCH v2] gnu: vim: Update to 8.2.0066 Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191231202134.o7npk5xcw3w46fw5@zdrowyportier.kadziolka.net \
--to=kuba@kadziolka.net \
--cc=38799@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).