From unknown Sun Sep 21 03:54:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27412] [PATCH] gnu: rustc: Enable tests. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2017 18:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 27412@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149772464819905 (code B ref -1); Sat, 17 Jun 2017 18:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jun 2017 18:37:28 +0000 Received: from localhost ([127.0.0.1]:53664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMIb4-0005At-Pj for submit@debbugs.gnu.org; Sat, 17 Jun 2017 14:37:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMIb1-0005Ag-Kv for submit@debbugs.gnu.org; Sat, 17 Jun 2017 14:37:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dMIav-0003W5-9g for submit@debbugs.gnu.org; Sat, 17 Jun 2017 14:37:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:59893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dMIav-0003Vv-6c for submit@debbugs.gnu.org; Sat, 17 Jun 2017 14:37:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dMIat-00073X-Dq for guix-patches@gnu.org; Sat, 17 Jun 2017 14:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dMIao-0003QY-Vb for guix-patches@gnu.org; Sat, 17 Jun 2017 14:37:11 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:52302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dMIao-0003Oq-Om for guix-patches@gnu.org; Sat, 17 Jun 2017 14:37:06 -0400 Received: from dayas.netgear.com (80-108-65-216.cable.dynamic.surfer.at [80.108.65.216]) by dd1012.kasserver.com (Postfix) with ESMTPSA id B29931CA020D; Sat, 17 Jun 2017 20:37:02 +0200 (CEST) From: Danny Milosavljevic Date: Sat, 17 Jun 2017 20:37:01 +0200 Message-Id: <20170617183701.28819-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.1 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.4 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * gnu/packages/rust.scm (rustc)[source]: Remove bundled llvm. [native-inputs]: Add bison, flex, procps. [inputs]: Update llvm to llvm-3.9.1. [arguments]: Patch and enable tests. --- gnu/packages/rust.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1217ec71f..1c03bde2a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -21,13 +21,16 @@ (define-module (gnu packages rust) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages elf) + #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -205,22 +208,27 @@ rustc-bootstrap and cargo-bootstrap packages.") "rustc-" version "-src.tar.gz")) (sha256 (base32 - "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr")))) + "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "src/llvm") + #t)))) (build-system gnu-build-system) (native-inputs - `(("cmake" ,cmake) + `(("bison" ,bison) ; For the tests + ("cmake" ,cmake) + ("flex" ,flex) ; For the tests ("git" ,git) + ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rust-bootstrap" ,rust-bootstrap) ("which" ,which))) (inputs `(("jemalloc" ,jemalloc) - ("llvm" ,llvm))) + ("llvm" ,llvm-3.9.1))) (arguments - ;; FIXME: Test failure with llvm 3.8; Update llvm. - ;; https://github.com/rust-lang/rust/issues/36835 - `(#:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-configure (lambda _ @@ -254,7 +262,18 @@ rustc-bootstrap and cargo-bootstrap packages.") (substitute* "src/tools/tidy/src/main.rs" (("^.*cargo.*::check.*$") "")) (substitute* "src/libstd/process.rs" - (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) + ;; The newline is intentional. + ;; There's a line length "tidy" check in Rust which would + ;; fail otherwise. + (("\"/bin/sh\"") (string-append " +\"" bash "/bin/sh\""))) + (substitute* "src/libstd/sys/unix/process/process_common.rs" + (("fn test_process_mask") "#[cfg_attr(target_os = \"linux\", ignore)] +fn test_process_mask")) + (substitute* "src/vendor/libc/src/lib.rs" + (("TODO") "TXDO")) + ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. + (delete-file-recursively "src/test/run-make/linker-output-non-utf8") #t))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) From unknown Sun Sep 21 03:54:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27412] [PATCH] gnu: rustc: Enable tests. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2017 16:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic , 27412@debbugs.gnu.org Received: via spool by 27412-submit@debbugs.gnu.org id=B27412.149780267832208 (code B ref 27412); Sun, 18 Jun 2017 16:18:01 +0000 Received: (at 27412) by debbugs.gnu.org; 18 Jun 2017 16:17:58 +0000 Received: from localhost ([127.0.0.1]:55264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMcte-0008NN-JJ for submit@debbugs.gnu.org; Sun, 18 Jun 2017 12:17:58 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMctb-0008ND-Dw for 27412@debbugs.gnu.org; Sun, 18 Jun 2017 12:17:53 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B6B202072E; Sun, 18 Jun 2017 12:17:50 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 12:17:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=9manF74hZl3kkmtpimQOiaZSvRio2cFSogaD63X+s HI=; b=YZABu5U4BsJtW3sf1oaFqsC3uroEv7TnIYGRHVJySiQweixUZ5THlTSEg AzWZXTnu+w2CrrU3MzJvQjziGlWZsiKC+D8zPkE16TQwgaZUwUWUu2OYr1QHRLWu 4o5z1fcFc9npS0EMJ1ccix8s2q9F1EmjcmAJqjmeKp7N0EbcbZSN/AQTSyOXApzV 6gd9n/to8BJM/A+jMl767DjUTcGG4n7WPzymm4WjIb6PiIWFuUPY4SS6aW4zgRec TCn10rujXMiWLFBJEbRFpjxCYsHG3sVtKb8bWQBPXslBk+J5/TRu/lJ656aRMLz/ G1KM9KQbTsdu8n3ATH83vqsj0st3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=9manF74hZl3kkmtpim QOiaZSvRio2cFSogaD63X+sHI=; b=evDtm27JHf8F7bkfMJ2EoTlwcALCZay33e WLc8mwGM1e5fQz1YRB5VY5+Fbcmqw1Y5xy6eXXh2NikXAAx7Gxsw7IcQOEc2+XP/ WQ+R7CfPjC9feg/9jUavdpy45wBgMuq+iYy9OLzO+jzW5w9S1y8xcz5rGgjfSIk8 aBbuGpXiPzSJGugWx/s72+xhQUg4r/laBcHSYPpzxp29IljFpbSLkRtVc4yK874T 8BdOM5zn2JSzoGhxEq3p4S5TBiHmf8rJx4CjEPsFtA6iN9LJ9hR7dHPsnBzhQpso 3mIn5gMWQxP/aCu7SEAkdiLenRjlv1p0Qh96gASPPsP9IdV35aQw== X-ME-Sender: X-Sasl-enc: yzwMFq3ESGhg6+oInJYKhIhzFzDTzuLIMcduXnS/3Btr 1497802670 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 47D437E865; Sun, 18 Jun 2017 12:17:50 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170617183701.28819-1-dannym@scratchpost.org> References: <20170617183701.28819-1-dannym@scratchpost.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 18:17:48 +0200 Message-ID: <87shixfexf.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > * gnu/packages/rust.scm (rustc)[source]: Remove bundled llvm. > [native-inputs]: Add bison, flex, procps. > [inputs]: Update llvm to llvm-3.9.1. > [arguments]: Patch and enable tests. Great! [...] > @@ -254,7 +262,18 @@ rustc-bootstrap and cargo-bootstrap packages.") > (substitute* "src/tools/tidy/src/main.rs" > (("^.*cargo.*::check.*$") "")) > (substitute* "src/libstd/process.rs" > - (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) > + ;; The newline is intentional. > + ;; There's a line length "tidy" check in Rust which would > + ;; fail otherwise. > + (("\"/bin/sh\"") (string-append " > +\"" bash "/bin/sh\""))) Can you use '\n' instead? > + (substitute* "src/libstd/sys/unix/process/process_common.rs" > + (("fn test_process_mask") "#[cfg_attr(target_os = \"linux\", ignore)] > +fn test_process_mask")) I'm guessing this is disabled due to some build container oddity? > + (substitute* "src/vendor/libc/src/lib.rs" > + (("TODO") "TXDO")) A comment about this would be nice. > + ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. > + (delete-file-recursively "src/test/run-make/linker-output-non-utf8") This is temporary, right? Maybe add the guix-devel URL? LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGp6wACgkQoqBt8qM6 VPrtkwgAvwXdIqevoyWB0sYqz1+S4ktqcRqgQVuDvlPlQ9BRT6xT1THGfbfVWEKU 7z3EhGxdqnC4y1Yqxj2h3DcDtRE4XezS3bmkDOjzaAMI/2bgSUuOjqAmOYvfcps7 hleeXiOyP+/9+ZPZqFgNhS2f4vl+JyPZEbp7EKl7LaNPs+ix+Jy4nieSNfjrHNxH NY6SoOqCAaXx/q2RXgEiaKw/4gmdYUSRdBkl5NA9f1o6QJsZWMMHeGnvmFXhS0Vd 659E2o7+cb2v7zwFfUqXol99TBZvWamOkNbLtPjaspKboy3YbED3pTTj+W9FeI7g yopD2ialqeyaw2T6JaQu0L0F3V0bHA== =mdPU -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Sep 21 03:54:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27412] [PATCH] gnu: rustc: Enable tests. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2017 17:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 27412@debbugs.gnu.org Received: via spool by 27412-submit@debbugs.gnu.org id=B27412.14978069246556 (code B ref 27412); Sun, 18 Jun 2017 17:29:02 +0000 Received: (at 27412) by debbugs.gnu.org; 18 Jun 2017 17:28:44 +0000 Received: from localhost ([127.0.0.1]:55282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMe0C-0001hg-C9 for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:28:44 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:57534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMe0A-0001hX-6s for 27412@debbugs.gnu.org; Sun, 18 Jun 2017 13:28:42 -0400 Received: from localhost (77.118.165.147.wireless.dyn.drei.com [77.118.165.147]) by dd1012.kasserver.com (Postfix) with ESMTPSA id AEA941CA0222; Sun, 18 Jun 2017 19:28:40 +0200 (CEST) Date: Sun, 18 Jun 2017 19:28:34 +0200 From: Danny Milosavljevic Message-ID: <20170618192834.5181cebe@scratchpost.org> In-Reply-To: <87shixfexf.fsf@fastmail.com> References: <20170617183701.28819-1-dannym@scratchpost.org> <87shixfexf.fsf@fastmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Marius, On Sun, 18 Jun 2017 18:17:48 +0200 Marius Bakke wrote: > > + (("\"/bin/sh\"") (string-append " > > +\"" bash "/bin/sh\""))) =20 >=20 > Can you use '\n' instead? No idea. I don't really use '\n' in Guile at all. I'll try it... > > + (substitute* "src/libstd/sys/unix/process/process_commo= n.rs" > > + (("fn test_process_mask") "#[cfg_attr(target_os =3D \= "linux\", ignore)] > > +fn test_process_mask")) =20 >=20 > I'm guessing this is disabled due to some build container oddity? Yeah. Strangely enough if I manually run the tests in "guix environment -C= -N", it works. WTF? See . > > + (substitute* "src/vendor/libc/src/lib.rs" > > + (("TODO") "TXDO")) =20 I think this was a false flag and it works without that substitution. I'll= try... > > + ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBR= ARY_PATH. > > + (delete-file-recursively "src/test/run-make/linker-outp= ut-non-utf8") =20 >This is temporary, right?=20 Not really. I think Guile will continue to convert char* to Unicode UCS-4 = (or similar) strings - so I don't see how that's ever going to change. Wha= t this Rust test does is it explicitly uses a NON-Unicode character (as in = 0xFF) to make sure that that works, too. I'm not sure what the use case is for that... See . >Maybe add the guix-devel URL? I'll add links to these archive entries as comments, and try without the "T= ODO" substitution and if all is well then I'll push to master (building tak= es =E2=89=88 4 h per round, so no hurry). Thanks for the review! From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 06:45:01 2017 Received: (at control) by debbugs.gnu.org; 15 Jul 2017 10:45:02 +0000 Received: from localhost ([127.0.0.1]:39552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dWKZJ-0001VX-Lv for submit@debbugs.gnu.org; Sat, 15 Jul 2017 06:45:01 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:58656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dWKZI-0001VP-Mv for control@debbugs.gnu.org; Sat, 15 Jul 2017 06:45:01 -0400 Received: from localhost (77.118.188.216.wireless.dyn.drei.com [77.118.188.216]) by dd1012.kasserver.com (Postfix) with ESMTPSA id CDA681CA02C8 for ; Sat, 15 Jul 2017 12:44:59 +0200 (CEST) Date: Sat, 15 Jul 2017 12:44:58 +0200 From: Danny Milosavljevic To: Message-ID: <20170715124458.369d8c36@scratchpost.org> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 27459 close 27412 [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.13.128.8 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 27459 close 27412 [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.13.128.8 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject close 27459 close 27412