From 0db65c168fd6dec57a357735fe130c80feba5460 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 23 Sep 2018 08:04:19 +0200 Subject: [PATCH] tests: Update package-transitive-supported-systems tests. * tests/packages.scm ("package-transitive-supported-systems, implicit inputs"): Test traditionally-bootstrapped architecture. ("package-transitive-supported-systems: reduced binary seed, implicit inputs"): New test for Reduced Binary Seed bootstrap. --- tests/packages.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/packages.scm b/tests/packages.scm index 237feb7aba..85c3ebe8b2 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module (guix build-system) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) + #:use-module (guix memoization) #:use-module (guix profiles) #:use-module (guix scripts package) #:use-module (gnu packages) @@ -311,13 +313,28 @@ (test-equal "package-transitive-supported-systems, implicit inputs" %supported-systems + ;; Here GNU-BUILD-SYSTEM adds implicit inputs that build only on + ;; %SUPPORTED-SYSTEMS. Thus the others must be ignored. + (let ((p (dummy-package "foo" + (build-system gnu-build-system) + (supported-systems + `("does-not-exist" "foobar" ,@%supported-systems))))) + (invalidate-memoization! package-transitive-supported-systems) + (parameterize ((%current-system "armhf-linux")) ; a traditionally-bootstrapped architecture + (package-transitive-supported-systems p)))) + +(test-equal "package-transitive-supported-systems: reduced binary seed, implicit inputs" + '("x86_64-linux" "i686-linux") + ;; Here GNU-BUILD-SYSTEM adds implicit inputs that build only on ;; %SUPPORTED-SYSTEMS. Thus the others must be ignored. (let ((p (dummy-package "foo" (build-system gnu-build-system) (supported-systems `("does-not-exist" "foobar" ,@%supported-systems))))) - (package-transitive-supported-systems p))) + (invalidate-memoization! package-transitive-supported-systems) + (parameterize ((%current-system "x86_64-linux")) + (package-transitive-supported-systems p)))) (test-assert "supported-package?" (let ((p (dummy-package "foo"