guix_mirror_bot pushed a commit to branch r-team
in repository guix.
commit 169a02d0425ef07dda10a6222191835ad0166b19
Author: Ricardo Wurmus <[email protected]>
AuthorDate: Wed Mar 11 14:20:01 2026 +0100
build-system/r: Make test directory configurable.
Previously we would accept the #:test-directory argument but ignore the
value.
* guix/build-system/r.scm (r-build): Set default value for TEST-DIRECTORY
field.
* guix/build/r-build-system.scm (patch-tests): Use value of TEST-DIRECTORY
argument.
Change-Id: If435577bc0e90ede360ee281ee5bc27fa1b0b3f0
---
guix/build-system/r.scm | 2 +-
guix/build/r-build-system.scm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index 565c7db344..f14a4c61c0 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -110,7 +110,7 @@ release corresponding to NAME and VERSION."
(tests? #t)
(test-target "tests")
(test-types #f)
- test-directory
+ (test-directory "tests/testthat")
skipped-tests
(configure-flags ''())
(phases '%standard-phases)
diff --git a/guix/build/r-build-system.scm b/guix/build/r-build-system.scm
index b32df93d2d..2473d61a6f 100644
--- a/guix/build/r-build-system.scm
+++ b/guix/build/r-build-system.scm
@@ -72,7 +72,7 @@
each consisting of a file name under TEST-DIRECTORY and one or more names of
tests to be skipped. If the entry is just a file name, delete the test file."
(when skipped-tests
- (with-directory-excursion "tests/testthat/"
+ (with-directory-excursion test-directory
(for-each (match-lambda
((file test-names ...)
(substitute file