From ff1146fb4f7254a8f644f89d7af6b4b566528603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 28 Oct 2023 01:30:37 +0200 Subject: tests: Adjust to cope with glibc graft. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 1328c4cca531318e3ed90c6aecb522a5b22a4bcc, which led to failures for tests that were not prepared to cope with that. * tests/guix-environment-container.sh (hello_drv_nested): Pass “-E GUIX_BUILD_OPTIONS” so ‘--no-grafts’ is passed. * tests/guix-pack.sh (GUIX_BUILD_OPTIONS): Add ‘--no-grafts’. * tests/transformations.scm ("options->transformation, with-graft"): Skip when ‘glibc-final’ has a replacement. Change-Id: Ia65c9aeb06f524252815b8290a5ca7bf97ee8136 --- tests/transformations.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/transformations.scm') diff --git a/tests/transformations.scm b/tests/transformations.scm index 704818b9ed..755211d65d 100644 --- a/tests/transformations.scm +++ b/tests/transformations.scm @@ -187,6 +187,11 @@ (string=? (package-full-name dep) (package-full-name findutils))))))))))) +;; The following test requires grafting enabled, but it becomes extremely +;; expensive if there's a graft on glibc or other package deep in the graph. +(when (package-replacement (@ (gnu packages commencement) glibc-final)) + (test-skip 1)) + (test-assert "options->transformation, with-graft" (let* ((p (dummy-package "guix.scm" (inputs `(("foo" ,grep) -- cgit v1.2.3