From 9809055707de8c518e928e09ea76dd10fbc19a6a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 11 Jun 2012 21:50:17 +0200 Subject: Add a `%current-system' fluid. * guix/utils.scm (gnu-triplet->nix-system): New procedure. (%current-system): New variable. * tests/utils.scm ("gnu-triplet->nix-system"): New test. * tests/derivations.scm (%current-system): Remove. Update users to use (%current-system) instead. --- tests/utils.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/utils.scm') diff --git a/tests/utils.scm b/tests/utils.scm index db4eb5a340..b3c7fefa39 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -20,6 +20,7 @@ (define-module (test-utils) #:use-module (guix utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) #:use-module (rnrs bytevectors) @@ -85,6 +86,18 @@ (define-module (test-utils) (close-pipe p) l)))) +(test-assert "gnu-triplet->nix-system" + (let ((samples '(("i586-gnu0.3" "i686-gnu") + ("x86_64-unknown-linux-gnu" "x86_64-linux") + ("i386-pc-linux-gnu" "i686-linux") + ("x86_64-unknown-freebsd8.2" "x86_64-freebsd") + ("x86_64-apple-darwin10.8.0" "x86_64-darwin") + ("i686-pc-cygwin" "i686-cygwin")))) + (let-values (((gnu nix) (unzip2 samples))) + (every (lambda (gnu nix) + (equal? nix (gnu-triplet->nix-system gnu))) + gnu nix)))) + (test-end) -- cgit v1.2.3