From b14a8385095f6672960fb8378c6578acf1ebbf8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 7 Sep 2016 23:59:02 +0200 Subject: utils: 'wrap-program' produces only one wrapper file. * guix/build/utils.scm (wrap-program)[wrapper-file-name] [next-wrapper-number, wrapper-target]: Remove. [wrapped-file, already-wrapped?]: New variables. [last-line]: New procedure. Use it to append to PROG when a wrapper already exists. * tests/build-utils.scm ("wrap-program, one input, multiple calls"): Adjust the list of files to delete. --- tests/build-utils.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/build-utils.scm b/tests/build-utils.scm index cc59b2eff7..7d49446f66 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -118,8 +118,7 @@ (let* ((pipe (open-input-pipe foo)) (str (get-string-all pipe))) (with-directory-excursion directory - (for-each delete-file - '("foo" ".foo-real" ".foo-wrap-01" ".foo-wrap-02"))) + (for-each delete-file '("foo" ".foo-real"))) (and (zero? (close-pipe pipe)) str)))))) -- cgit v1.2.3