guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/05: tests: Silence %have-nix-hash?.


From: Mathieu Lirzin
Subject: 04/05: tests: Silence %have-nix-hash?.
Date: Tue, 29 Mar 2016 20:54:01 +0000

mthl pushed a commit to branch wip-check
in repository guix.

commit b65703c03e43e35d9f2bfd1ae2b0a858b47177f7
Author: Mathieu Lirzin <address@hidden>
Date:   Wed Mar 23 22:37:06 2016 +0100

    tests: Silence %have-nix-hash?.
    
    * tests/base32.scm (%have-nix-hash?): Use 'which' instead of 'system' to
    avoid polluting standard output.
---
 tests/base32.scm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/base32.scm b/tests/base32.scm
index 194f8da..7f59e76 100644
--- a/tests/base32.scm
+++ b/tests/base32.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,6 +20,7 @@
 (define-module (test-base32)
   #:use-module (guix hash)
   #:use-module (guix base32)
+  #:use-module (guix build utils)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-34)
@@ -39,9 +41,7 @@
       "nix-hash"))
 
 (define %have-nix-hash?
-  ;; Note: Use `system', not `system*', because of <http://bugs.gnu.org/13166>.
-  (false-if-exception
-   (zero? (system (string-append %nix-hash " --version")))))
+  (which %nix-hash))
 
 (test-begin "base32")
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]