ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-ess: Fix build.

Browse source 
* gnu/packages/statistics.scm (emacs-ess)[arguments]<#:phases>: Fix syntax
category for a skipped a test.  Extend syntax to check for tests in more files.

Change-Id: I7344637107920288995893dec2b1e6642d11f95e
This commit is contained in:
Nicolas Goaziou 2024-06-19 08:11:38 +02:00
parent 5aba852c18
commit da1f3aff2e
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/statistics.scm
View file

@ -6922,34 +6922,33 @@ (define-public emacs-ess
(let-syntax
((disable-tests
(syntax-rules ()
((_ file ())
((_ ())
(syntax-error "test names list must not be empty"))
((_ file (test-name ...))
(substitute* file
((_ (test-name ...))
(substitute* (find-files "test" "\\.el$")
(((string-append "^\\(ert-deftest " test-name ".*")
all)
(string-append all "(skip-unless nil)\n"))
...))))
(disable-etests ;different test syntax
(syntax-rules ()
((_ file ())
((_ ())
(syntax-error "test names list must not be empty"))
((_ file (test-name ...))
(emacs-batch-edit-file file
'(progn
(mapc (lambda (test)
(goto-char (point-min))
(search-forward
(format "etest-deftest %s " test))
(beginning-of-line)
(kill-sexp))
(list test-name ...))
(basic-save-buffer)))))))
(disable-tests (list "test/ess-test-inf.el"
"test/ess-test-r.el")
("ess--derive-connection-path"
;; Looks like an off-by-one error.
"ess--command-browser-unscoped-essr"
((_ (test-name ...))
(for-each
(lambda (file)
(emacs-batch-edit-file file
'(progn
(dolist (test (list test-name ...))
(goto-char (point-min))
(let ((s (format "etest-deftest %s "
test)))
(when (search-forward s nil t)
(beginning-of-line)
(kill-sexp))))
(basic-save-buffer))))
(find-files "test" "\\.el$"))))))
(disable-tests ("ess--derive-connection-path"
"ess-eval-line-test"
"ess-eval-region-test"
"ess-mock-remote-process"
@ -6957,9 +6956,10 @@ (define-public emacs-ess
"ess-r-load-ESSR-github-fetch-yes"
"ess-set-working-directory-test"
"ess-test-r-startup-directory"))
(disable-etests "test/ess-test-r-eval.el"
("ess-r-eval-ns-env-roxy-tracebug-test"
"ess-r-eval-sink-freeze-test")))))
(disable-etests ("ess-r-eval-ns-env-roxy-tracebug-test"
"ess-r-eval-sink-freeze-test"
;; Looks like an off-by-one error.
"ess--command-browser-unscoped-essr")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "make" "test"))))))))