03/03: gnu: vim: Fix a failing test.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 5a717c55267c7ffd09445a7e0fb2733a12d2f996
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Nov 20 00:05:51 2020 +0100

    gnu: vim: Fix a failing test.
    
    * gnu/packages/vim.scm (vim)[arguments]: Rename the ‘skip-failing-tests’
    phase to ‘skip-or-fix-failing-tests’.  Fix a failing test.
---
 gnu/packages/vim.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index c2115b1..26f2547 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -110,7 +110,7 @@
              ;; Make sure the TERM environment variable is set for the tests
              (setenv "TERM" "xterm")
              #t))
-         (add-before 'check 'skip-failing-tests
+         (add-before 'check 'skip-or-fix-failing-tests
            (lambda _
              ;; This test assumes that PID 1 is run as root and that the user
              ;; running the test suite does not have permission to kill(1, 0)
@@ -131,6 +131,20 @@
              (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)))))
     (inputs
      `(("gawk" ,gawk)