From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: [PATCH] tests: Use '.' and not 'source' which is a Bashism. Date: Wed, 06 May 2015 22:08:04 +0200 Message-ID: <87lhh1jwpn.fsf@taylan.uni.cx> References: <87pp6dk1rs.fsf@taylan.uni.cx> <20150506193212.GA10069@intra> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yq5c2-0005cx-I1 for guix-devel@gnu.org; Wed, 06 May 2015 16:08:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yq5bz-0008Pd-FR for guix-devel@gnu.org; Wed, 06 May 2015 16:08:10 -0400 Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:33914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yq5bz-0008PK-7t for guix-devel@gnu.org; Wed, 06 May 2015 16:08:07 -0400 Received: by wgso17 with SMTP id o17so23406538wgs.1 for ; Wed, 06 May 2015 13:08:06 -0700 (PDT) In-Reply-To: <20150506193212.GA10069@intra> (John Darrington's message of "Wed, 6 May 2015 21:32:13 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: John Darrington Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain John Darrington writes: > Since we use bash, I don't think it matters if we have constructs > which don't work on the traditional bourne shell. This is about building Guix though, which should work on any POSIX system (approximately at least?) with the dependencies listed in the README. By the way it seems that wasn't the only issue in the test. Here is a better patch, this time tested on Debian with /bin/sh set to dash: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-tests-Fix-etc-profile-test.patch >From f165e9a91118936e72f7df836446541c093c8329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Wed, 6 May 2015 20:13:31 +0200 Subject: [PATCH] tests: Fix etc/profile test. * tests/profiles.scm ("etc/profile"): Unset GUIX_PROFILE before sourcing etc/profile. Use '.' instead of 'source' for sourcing, since the latter is a Bashism. Call 'echo $PATH' instead of using the output of 'set' to determine whether PATH is set, because the output of 'set' differs between shells. --- tests/profiles.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/profiles.scm b/tests/profiles.scm index a397171..6b1a907 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -237,14 +237,13 @@ (mbegin %store-monad (built-derivations (list drv)) (let* ((pipe (open-input-pipe - (string-append "source " - profile "/etc/profile; " - "unset GUIX_PROFILE; set"))) - (env (get-string-all pipe))) + (string-append "unset GUIX_PROFILE; " + ". " profile "/etc/profile; " + "echo $PATH"))) + (path (get-string-all pipe))) (return (and (zero? (close-pipe pipe)) - (string-contains env - (string-append "PATH=" profile "/bin")))))))) + (string-contains path (string-append profile "/bin")))))))) (test-end "profiles") -- 2.2.1 --=-=-=--