From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cOqKM2QzWGFGpgAAgWs5BA (envelope-from ) for ; Sat, 02 Oct 2021 12:24:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UJAnL2QzWGGMCAAAbx9fmQ (envelope-from ) for ; Sat, 02 Oct 2021 10:24:36 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9D5AC2AB81 for ; Sat, 2 Oct 2021 12:24:36 +0200 (CEST) Received: from localhost ([::1]:52384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWcC3-0002Ki-R1 for larch@yhetil.org; Sat, 02 Oct 2021 06:24:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWcBZ-0002I6-HO for guix-patches@gnu.org; Sat, 02 Oct 2021 06:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWcBY-0000DP-P1 for guix-patches@gnu.org; Sat, 02 Oct 2021 06:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWcBY-0007ZU-Ll for guix-patches@gnu.org; Sat, 02 Oct 2021 06:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50960] [PATCH 05/10] environment: Add tests for '--profile'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 10:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50960 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50960@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 50960-submit@debbugs.gnu.org id=B50960.163317019328992 (code B ref 50960); Sat, 02 Oct 2021 10:24:04 +0000 Received: (at 50960) by debbugs.gnu.org; 2 Oct 2021 10:23:13 +0000 Received: from localhost ([127.0.0.1]:57973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWcAj-0007XT-FK for submit@debbugs.gnu.org; Sat, 02 Oct 2021 06:23:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWcAV-0007UK-JG for 50960@debbugs.gnu.org; Sat, 02 Oct 2021 06:23:12 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49196) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWcAQ-0007dr-2w; Sat, 02 Oct 2021 06:22:54 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36460 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWcAP-0007gb-KL; Sat, 02 Oct 2021 06:22:54 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 2 Oct 2021 12:22:35 +0200 Message-Id: <20211002102240.27815-5-ludo@gnu.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211002102240.27815-1-ludo@gnu.org> References: <20211002102240.27815-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633170276; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=2u/7htT/wTvSmeVRVwhBU84UBeFgmHlGxq72qGOEtco=; b=usDIH7GUNpauPOyROzY0quoYVIcgx2OUR71Y2KDHW1McZOyZh7UsI2im3Fhz6G5uLzpUrF uzRE8ulrV/xEq5yWLiItHqQy494Q6iHrEyNtnh44HjMKy2ckwNPsiuBlXfE+q3nHqCBp0D I4eaAiLi4jjjs7jOyqTHK4UGdtiYQFYibt+26EvWBlz0lQzTNknwEPVFEqemHbN2HydfGM /3q0SCSQymyrxdrNZ96niUbF31MTzXWvXCjPhv3F23hDu/mzPoIOQW1Dj1v2eAJi4J6Dxy jHr1D0YlftZJGL8YRVEf5UiGT5Cn+idP2Bcm/9ZV7wuLo5nEdJ0XVhg+MdE9sg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633170276; a=rsa-sha256; cv=none; b=XOGzM1wGbfUNx1T5ttho0Y7JvNacGnscI21P9Wx3tQOFdLzdJKbgSgIu+ZEe9PlqSTeXm9 miy6HUzL+JgluFvWuVcIqLDb/4IuCe76dsbwJBls2GLwv6vad5Pvm4k/wiRMojOEMLRjGe 6hqhocu+LapqusaVmn1he7QEs4OdWO2VweXV5ZQwKrOTG9L8b9qBpKmsoBPsUgmjJDj/Yg ePOIN71iVw+71h5Jcwvpp3pZfdkV2QhNAGL4sWTsSlMR/sE+Z9AJxUKxh7xUWsUmhhDcHq 3Fos/BLnu2GrkZQ5rbR8YhkXrmK0+EK0L7BdbAtS0weKVVd2s8mXdM703A/N5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.79 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9D5AC2AB81 X-Spam-Score: 2.79 X-Migadu-Scanner: scn1.migadu.com X-TUID: F2xK5xGN/qGD This is a followup to a643deac2de81755a1843a3b41dd53857678bebc. * tests/guix-environment-container.sh, tests/guix-environment.sh: Add tests for '--profile'. --- tests/guix-environment-container.sh | 8 ++++++++ tests/guix-environment.sh | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index f2d15c8d0c..2e238c501d 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -44,6 +44,14 @@ else test $? = 42 fi +# Try '--root' and '--profile'. +root="$tmpdir/root" +guix environment -C --ad-hoc --bootstrap guile-bootstrap -r "$root" -- guile --version +guix environment -C -p "$root" --bootstrap -- guile --version +path1=$(guix environment -C -p "$root" --bootstrap -- guile -c '(display (getenv "PATH"))') +path2=$(guix environment -C --ad-hoc --bootstrap guile-bootstrap -- guile -c '(display (getenv "PATH"))') +test "$path1" = "$path2" + # Make sure "localhost" resolves. guix environment --container --ad-hoc --bootstrap guile-bootstrap \ -- guile -c '(exit (pair? (getaddrinfo "localhost" "80")))' diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index afadcbe195..f4fc2e39ed 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -119,6 +119,13 @@ test `readlink "$gcroot"` = "$expected" guix environment --bootstrap -r "$gcroot" --ad-hoc guile-bootstrap \ -- guile -c 1 test `readlink "$gcroot"` = "$expected" + +# Make sure '-p' works as expected. +test $(guix environment -p "$gcroot" -- "$SHELL" -c 'echo $GUIX_ENVIRONMENT') = "$expected" +paths1="$(guix environment -p "$gcroot" --search-paths)" +paths2="$(guix environment --bootstrap --ad-hoc guile-bootstrap --search-paths)" +test "$paths1" = "$paths2" + rm "$gcroot" # Try '-r' with a relative file name. -- 2.33.0