me/guix
Archived
1
0
Fork 0
Code Activity

Revert "gnu: vim: Run more tests."

Browse source 
This reverts commit 17a53aec7a.

This breaks building vim on ARM architectures.
This commit is contained in:
Efraim Flashner 2020-12-07 12:32:49 +02:00
parent 3832704aff
commit 27cf238744
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/vim.scm
View file

@ -121,36 +121,30 @@
(substitute* "src/testdir/test_swap.vim" (substitute* "src/testdir/test_swap.vim"
(("if !IsRoot\\(\\)") "if 0")) (("if !IsRoot\\(\\)") "if 0"))
;; These tests compares output against a golden ‘…/|b|i|n|/|s|h…’ ;; These tests check 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")))
(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 ;; literal. We need to match that and substitute a similarly
;; ‘spliced’ path to ‘sh’ in the store, truncated to the last ;; ‘spliced’ path to ‘sh’ in the store, truncated to the last
;; 44 (spliced: 88) or so characters. ;; 44 (spliced: 88) characters.
;; Two of the tests we simply skip instead of patching the screen dump.
(substitute* "src/testdir/test_popupwin.vim"
((".*Test_popupwin_term_0[1|2].*") ""))
;; We replace the external program call (!) with a scroll-back (<)
;; symbol and blindly fix some other differences based on error output.
(let ((splice (lambda (s separator) (let ((splice (lambda (s separator)
(string-join (map string (string->list s)) (string-join (map string (string->list s))
separator)))) separator))))
(substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump" (substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump"
(((splice "/bin/sh" "\\|")) (((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 44) "|")) (splice (string-take-right (which "sh") 44) "|"))
;; Blindly fix some other differences based on error output.
(("^\\|!") "|<") (("^\\|!") "|<")
(("@37") "")) (("@37") "")))
(substitute* '("src/testdir/dumps/Test_terminal_scrollback_1.dump"
"src/testdir/dumps/Test_terminal_scrollback_2.dump")
(((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 61) "|"))
(("^\\|!") "|<")
((" @55") " @1"))
(substitute* '("src/testdir/dumps/Test_terminal_scrollback_3.dump"
"src/testdir/dumps/Test_popupwin_term_03.dump"
"src/testdir/dumps/Test_popupwin_term_04.dump")
(((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 62) "|"))
(("^\\|!") "|<")
(("\\]\\| @56") "]| @1")))
#t))))) #t)))))
(inputs (inputs
`(("gawk" ,gawk) `(("gawk" ,gawk)