branch master updated: gnu: vim: Skip terminal screen-dump tests.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4a0a453  gnu: vim: Skip terminal screen-dump tests.
4a0a453 is described below

commit 4a0a4533920c11bf4ddb8c06bee3c2720fa811df
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Jan 10 09:47:38 2021 +0200

    gnu: vim: Skip terminal screen-dump tests.
    
    Even with careful substitutions these tests often break on other
    architectures anyway.
    
    * gnu/packages/vim.scm (vim)[arguments]: Adjust
    skip-or-fix-failing-tests to skip another terminal screen-dump test.
---
 gnu/packages/vim.scm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index da4404e..3e120fa 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -126,25 +126,13 @@
              ;; 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_open_term_from_cmd.*" line)
+                (string-append line "return\n"))
                ((".*Test_terminal_postponed_scrollback.*" line)
                 (string-append line "return\n")))
              (substitute* "src/testdir/test_popupwin.vim"
                ((".*Test_popup_drag_termwin.*" line)
                 (string-append line "return\n")))
-
-             ;; This test compares output against a golden ‘…/|b|i|n|/|s|h…’
-             ;; literal.  We need to match that and substitute a similarly
-             ;; ‘spliced’ path to ‘sh’ in the store, truncated to the last
-             ;; 44 (spliced: 88) characters.
-             (let ((splice (lambda (s separator)
-                               (string-join (map string (string->list s))
-                                            separator))))
-               (substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump"
-                 (((splice "/bin/sh" "\\|"))
-                  (splice (string-take-right (which "sh") 44) "|"))
-                 ;; Blindly fix some other differences based on error output.
-                 (("^\\|!") "|<")
-                 (("@37") "")))
              #t))
          (add-after 'install 'install-guix.vim
            (lambda* (#:key inputs outputs #:allow-other-keys)