From patchwork Sun Feb 27 13:53:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 37521 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 468A527BBEA; Sun, 27 Feb 2022 14:05:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D21327BBE9 for ; Sun, 27 Feb 2022 14:05:37 +0000 (GMT) Received: from localhost ([::1]:46494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOKB6-0007HA-93 for patchwork@mira.cbaines.net; Sun, 27 Feb 2022 09:05:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOK0w-0000WQ-8x for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOK0v-0001t3-Jw for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOK0v-0004uT-Ix for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54180] [PATCH 08/12] tests: Simplify use of 'local-file' in 'tests/guix-home.sh'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 13:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54180@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 54180-submit@debbugs.gnu.org id=B54180.164597006918746 (code B ref 54180); Sun, 27 Feb 2022 13:55:05 +0000 Received: (at 54180) by debbugs.gnu.org; 27 Feb 2022 13:54:29 +0000 Received: from localhost ([127.0.0.1]:57172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK0L-0004sC-0G for submit@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK0B-0004qM-ER for 54180@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:20 -0500 Received: from [2001:470:142:3::e] (port=50242 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJzz-0001Zi-Q1; Sun, 27 Feb 2022 08:54:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=uwkm38vquwJo7BaR1mNPNzxsggoICWpBcwabRkBK9kU=; b=SoL2WtDHSyakriqd4LUq hWWEEzOxnKbaU/DYJ4pediTZTmjAKpH3IIhj6eFnVQpOS68LyYp9Lr3ZbGhOhHZAyuHViYdXQGmMi lKlW/YYcfQ27twDF/aMPS1D/p0rbdXh+GPgVVufesXnnbuxNiTXuy5/XAK4DMJZXc6DYZo7JQ8FS+ 9wXYMfZePvDIz9kQuJg5WUYzAx3uWO5xo7FFZOlRBbjyHOI04gnGBwKlQk3Owqj4FUoVw9/0lFbOq G7A1OUhbSOgcYhmpf249XG4NsPvyMErAXcoy4f2WQdN13YRJRNhlWaqmBG1IrNeHui/15K8gZ4x1j MNv+RGVROZxN8A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55804 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 1nOJzw-0007Pg-SH; Sun, 27 Feb 2022 08:54:05 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 27 Feb 2022 14:53:38 +0100 Message-Id: <20220227135342.10296-8-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220227135342.10296-1-ludo@gnu.org> References: <20220227135342.10296-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * tests/guix-home.sh: Remove 'current-filename' trickery since 'local-file' resolves file names relative to the containing file. --- tests/guix-home.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/guix-home.sh b/tests/guix-home.sh index ae3e52c9e1..3b397649cc 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -81,10 +81,7 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT (service home-bash-service-type (home-bash-configuration (guix-defaults? #t) - (bashrc - (list - (local-file (string-append (dirname (current-filename)) - "/dot-bashrc")))))) + (bashrc (list (local-file "dot-bashrc"))))) (simple-service 'home-bash-service-extension-test home-bash-service-type