summary refs log tree commit diff
path: root/tests/utils.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-04 21:44:52 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-04 23:30:51 +0200
commit6568d2bd6e4e047dd95b00a7a6e7501a16491eb5 (patch)
treef5f16ed73cbb0486fd00a8147707ce75b2132df4 /tests/utils.scm
parente89431bf016830a919ec2430889f6c2679aab408 (diff)
downloadguix-6568d2bd6e4e047dd95b00a7a6e7501a16491eb5.tar.gz
search-paths: Add 'evaluate-search-paths', from (guix scripts package).
* guix/scripts/package.scm (with-null-error-port,
  evaluate-search-paths): Move to...
* guix/search-paths.scm: ... here.
* guix/utils.scm (string-tokenize*): Move to...
* guix/search-paths.scm: ... here.
* tests/utils.scm ("string-tokenize*"): Adjust accordingly.
Diffstat (limited to 'tests/utils.scm')
-rw-r--r--tests/utils.scm11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/utils.scm b/tests/utils.scm
index a662c9a8d3..e03a07b2f5 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -82,10 +82,11 @@
     ("foo" "bar" "baz")
     ("foo" "bar" "")
     ("foo" "bar" "baz"))
-  (list (string-tokenize* "foo" ":")
-        (string-tokenize* "foo;bar;baz" ";")
-        (string-tokenize* "foo!bar!" "!")
-        (string-tokenize* "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" "+-+"))))
 
 (test-equal "string-replace-substring"
   '("foo BAR! baz"