From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr2OR-00015J-G6 for guix-patches@gnu.org; Tue, 05 Feb 2019 10:12:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr2OP-00034f-Vu for guix-patches@gnu.org; Tue, 05 Feb 2019 10:12:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr2OM-00032Y-SS for guix-patches@gnu.org; Tue, 05 Feb 2019 10:12:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gr2OJ-00005G-Ol for guix-patches@gnu.org; Tue, 05 Feb 2019 10:12:06 -0500 Subject: bug#34187: [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning. Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Maxim Cournoyer References: <87pnsm4qrc.fsf@gmail.com> <87a7jjm6pi.fsf@gnu.org> Date: Tue, 05 Feb 2019 10:11:26 -0500 In-Reply-To: <87a7jjm6pi.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 29 Jan 2019 23:36:57 +0100") Message-ID: <871s4ml17l.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 34187-done@debbugs.gnu.org Hello, and sorry for the delay! Ludovic Court=C3=A8s writes: > Hello, > > Maxim Cournoyer skribis: > >>>>From 532f0dfeaa5f9aa7c03916afc843d5556a12f53c Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> 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 = the >> 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 directo= ry in >> + ;; the wrapper. >> + (remove (lambda (p) >> + (string=3D? p source-drv)) >> + (string-split (getenv "EMACSLOADPATH")= #\:)))) > > Or simply: (delete source-drv (string-split (getenv "EMACSLOADPATH") #\:)= )). This is much simpler, thanks! >> + (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 = not a derivation. How > about =E2=80=98source=E2=80=99, =E2=80=98source-directory=E2=80=99, or so= mething like that? Right. I've settled for source-directory. > Instead of hardcoding /tmp/guix-build-*, you could just use (getcwd), if > I=E2=80=99m not mistaken. (getcwd) wasn't in the tmp directory (it should be in the store IIRC, since we byte-compile the files in-place after installing them), but (getenv "TMPDIR") returned exactly what was needed. > OK with changes along these lines, thanks! The changes read as: --8<---------------cut here---------------start------------->8--- modified gnu/packages/emacs-xyz.scm @@ -6955,18 +6955,13 @@ Emacs.") ("emacs-s" ,emacs-s) ("emacs-shut-up" ,emacs-shut-up))) (arguments - `(#:modules ((guix build emacs-build-system) - (guix build emacs-utils) - (guix build utils) - (srfi srfi-1)) ;for `remove' - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'install 'install-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (source-drv (string-append - "/tmp/guix-build-" ,name "-" ,version - ".drv-0/source"))) + (source-directory (string-append + (getenv "TMPDIR") "/source"))) (substitute* "bin/ert-runner" (("ERT_RUNNER=3D\"\\$\\(dirname \\$\\(dirname \\$0\\)\\= )") (string-append "ERT_RUNNER=3D\"" out @@ -6977,8 +6972,7 @@ Emacs.") (list "EMACSLOADPATH" ":" 'prefix ;; Do not capture the transient source directory = in ;; the wrapper. - (remove (lambda (p) - (string=3D? p source-drv)) + (delete source-directory (string-split (getenv "EMACSLOADPATH") #\= :)))) #t)))) #:include (cons* "^reporters/.*\\.el$" %default-include))) --8<---------------cut here---------------end--------------->8--- And the commit message was also reworded. Pushed to master with commit f9dff4f7f. Thank you! Maxim