From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:38883)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1goc07-0004It-Lc
	for guix-patches@gnu.org; Tue, 29 Jan 2019 17:37:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1goc06-0001qi-Rw
	for guix-patches@gnu.org; Tue, 29 Jan 2019 17:37:03 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:51654)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1goc06-0001qJ-N2
	for guix-patches@gnu.org; Tue, 29 Jan 2019 17:37:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1goc06-0000uX-GK
	for guix-patches@gnu.org; Tue, 29 Jan 2019 17:37:02 -0500
Subject: [bug#34187] [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning.
Resent-Message-ID: <handler.34187.B34187.15488014203493@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <87pnsm4qrc.fsf@gmail.com>
Date: Tue, 29 Jan 2019 23:36:57 +0100
In-Reply-To: <87pnsm4qrc.fsf@gmail.com> (Maxim Cournoyer's message of "Wed, 23
	Jan 2019 23:35:19 -0500")
Message-ID: <87a7jjm6pi.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 34187@debbugs.gnu.org

Hello,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

>>>From 532f0dfeaa5f9aa7c03916afc843d5556a12f53c Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Tue, 22 Jan 2019 05:33:19 +0000
> Subject: [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning.
>
> This fixes the warning message such as: "Warning: Lisp directory
> '/tmp/guix-build-emacs-ert-runner-0.7.0-1.90b8fdd.drv-0/source': No such =
file
> or directory" that would be printed upon running ert-runner.
>
> * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[modules]: Add (srfi srfi-=
1) to
> the list of used modules.
> [phases]{install-executable}: Compute SOURCE-DRV and filter it out from t=
he
> paths composing the EMACSLOADPATH variable used in the wrapper.

Good catch!

>                   (wrap-program (string-append out "/bin/ert-runner")
>                     (list "EMACSLOADPATH" ":" 'prefix
> -                         (string-split (getenv "EMACSLOADPATH") #\:)))
> +                         ;; Do not capture the transient source director=
y in
> +                         ;; the wrapper.
> +                         (remove (lambda (p)
> +                                   (string=3D? p source-drv))
> +                                 (string-split (getenv "EMACSLOADPATH") =
#\:))))

Or simply: (delete source-drv (string-split (getenv "EMACSLOADPATH") #\:))).

> +                     (source-drv (string-append
> +                                  "/tmp/guix-build-" ,name "-" ,version
> +                                  ".drv-0/source")))

Actually =E2=80=98source-drv=E2=80=99 is misleading because it=E2=80=99s no=
t a derivation.  How
about =E2=80=98source=E2=80=99, =E2=80=98source-directory=E2=80=99, or some=
thing like that?

Instead of hardcoding /tmp/guix-build-*, you could just use (getcwd), if
I=E2=80=99m not mistaken.

OK with changes along these lines, thanks!

Ludo=E2=80=99.