From 208f7cd155abdf07ae4f858aeeb26892eb08df88 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 Jun 2012 23:58:07 +0200 Subject: Abstract build systems. * Makefile.am (MODULES): Add `guix/build-system.scm' and `guix/build-system/gnu.scm'. Remove `guix/gnu-build-system.scm'. * guix/build-system.scm: New file. * guix/gnu-build-system.scm: Rename to... * guix/build-system/gnu.scm: ... this. (gnu-build-system): New variable. * tests/builders.scm: Adjust `use-module' clauses. ("gnu-build-system"): New test. --- tests/builders.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/builders.scm b/tests/builders.scm index 851baa9ebf..17bae2c754 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -19,7 +19,8 @@ (define-module (test-builders) #:use-module (guix http) - #:use-module (guix gnu-build-system) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix derivations) @@ -41,6 +42,10 @@ (define %store (and (build-derivations %store (list drv-path)) (file-exists? (derivation-path->output-path drv-path))))) +(test-assert "gnu-build-system" + (and (build-system? gnu-build-system) + (eq? gnu-build (build-system-builder gnu-build-system)))) + (test-assert "gnu-build" (let* ((url "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz") (hash (nix-base32-string->bytevector -- cgit v1.2.3