From d838e7029854d8517c0c5b631f6042a925c86a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 6 May 2015 11:10:24 +0200
Subject: [PATCH] search-paths: Export 'string-tokenize*'.

* guix/search-paths.scm (string-tokenize*): Export.
* tests/utils.scm ("string-tokenize*"): Adjust accordingly.
---
 guix/search-paths.scm |  1 +
 tests/utils.scm       | 10 +++++-----
 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"