aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-06 11:10:24 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-06 18:26:53 +0200
commitd838e7029854d8517c0c5b631f6042a925c86a81 (patch)
tree19304b38e43f88b9e13dd046c876a7e5c1beb8c8
parentb5cd1e4f939670236ef29b62f2721fe67012d690 (diff)
downloadguix-d838e7029854d8517c0c5b631f6042a925c86a81.tar
guix-d838e7029854d8517c0c5b631f6042a925c86a81.tar.gz
search-paths: Export 'string-tokenize*'.
* guix/search-paths.scm (string-tokenize*): Export. * tests/utils.scm ("string-tokenize*"): Adjust accordingly.
-rw-r--r--guix/search-paths.scm1
-rw-r--r--tests/utils.scm10
2 files changed, 6 insertions, 5 deletions
diff --git a/guix/search-paths.scm b/guix/search-paths.scm
index ee7e9a131f..7fd15d440c 100644
--- a/guix/search-paths.scm
+++ b/guix/search-paths.scm
@@ -35,6 +35,7 @@
search-path-specification->sexp
sexp->search-path-specification
+ string-tokenize*
evaluate-search-paths
environment-variable-definition
search-path-definition))
diff --git a/tests/utils.scm b/tests/utils.scm
index e03a07b2f5..115868c857 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -21,6 +21,7 @@
#:use-module ((guix config) #:select (%gzip))
#:use-module (guix utils)
#:use-module ((guix store) #:select (%store-prefix store-path-package-name))
+ #:use-module ((guix search-paths) #:select (string-tokenize*))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-64)
@@ -82,11 +83,10 @@
("foo" "bar" "baz")
("foo" "bar" "")
("foo" "bar" "baz"))
- (let ((string-tokenize* (@@ (guix search-paths) string-tokenize*)))
- (list (string-tokenize* "foo" ":")
- (string-tokenize* "foo;bar;baz" ";")
- (string-tokenize* "foo!bar!" "!")
- (string-tokenize* "foo+-+bar+-+baz" "+-+"))))
+ (list (string-tokenize* "foo" ":")
+ (string-tokenize* "foo;bar;baz" ";")
+ (string-tokenize* "foo!bar!" "!")
+ (string-tokenize* "foo+-+bar+-+baz" "+-+")))
(test-equal "string-replace-substring"
'("foo BAR! baz"