From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Lfl-0006cI-PV for guix-patches@gnu.org; Sat, 29 Sep 2018 16:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6Lfi-0007sA-Jq for guix-patches@gnu.org; Sat, 29 Sep 2018 16:17:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6Lfi-0007rt-AS for guix-patches@gnu.org; Sat, 29 Sep 2018 16:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g6Lfi-00008R-1Z for guix-patches@gnu.org; Sat, 29 Sep 2018 16:17:02 -0400 Subject: [bug#32870] [PATCH 4/6] gnu: ruby-sass-spec: Fix spec expectation. Resent-Message-ID: References: <20180929104502.8536-1-mail@cbaines.net> <20180929104502.8536-4-mail@cbaines.net> <20180929141509.769b45d6@lepiller.eu> From: Christopher Baines In-reply-to: <20180929141509.769b45d6@lepiller.eu> Date: Sat, 29 Sep 2018 21:16:13 +0100 Message-ID: <87efdc6ovm.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Julien Lepiller Cc: 32870@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Julien Lepiller writes: > Le Sat, 29 Sep 2018 11:45:00 +0100, > Christopher Baines a =C3=A9crit : > >> This fixes building ruby-sass with Ruby 2.5. >> >> * gnu/packages/ruby.scm (ruby-sass-spec)[arguments]: Add patch-test >> phase to fix the expectation of one of the tests. >> --- >> gnu/packages/ruby.scm | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm >> index c039df1559..a7dd82cf02 100644 >> --- a/gnu/packages/ruby.scm >> +++ b/gnu/packages/ruby.scm >> @@ -5457,7 +5457,14 @@ strings or files.") >> ("ruby-terminfo" ,ruby-terminfo))) >> (arguments >> ;; No Rakefile >> - `(#:tests? #f)) >> + `(#:tests? #f >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'unpack 'patch-test >> + (lambda _ >> + (delete-file "spec/values/colors/alpha_hex-3.5/error") >> + (substitute* >> "spec/values/colors/alpha_hex-3.5/expected_output.css" >> + (("string") "color"))))))) >> (home-page "https://github.com/sass/sass-spec") >> (synopsis "Test suite for Sass") >> (description "Sass Spec is a test suite for Sass. Test cases >> are all in > > If you don't enable tests, why bother fixing them? Good question, maybe the comment could be improved. The tests are for a implementation of Sass, so in this case, the motivation is allowing upgrading the ruby-sass package in Guix (which runs these tests) and the general Ruby 2.5 upgrade. Running the tests here would be a bit difficult with Guix, as you'd need to avoid a circular dependency problem, but I think just running them when build ruby-sass is fine. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAluv3Y1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcUCRAAgBcV19WgUExaRdkGu2DHL2Pujcc41+UFt3MNhJET/ZKUfmg2ntbQBo4Z gVfsMGK0ME3+UxyWf7vi6baWk+cp1/NdKJc70NPdnkvaNkWkt0fkRO1UOyMokIbj xV+znlBOpxW71405Z0nPj/qXn04divhvD62izLERfFU2sNhxi3LU32OyASszTKPI PUH9mCAKU57ZK0ALqfIYdVBR2S7uvMuWOSxhyMozfSPP1F7JOryLVqUNG6hzy+rC 96qatPTx7ICvVObU9qomgXpN00EtuJ/Udy9eLAx682+m/4ppTau31DjYwNQcQMPE MbsYmptaVDdZoVvSD4eptzEVOSKxQkQ9swP2ZKRkLNs1GFi7E6o9bvSsXzfd4zKr H3SvbX/qZIGDU+ZWpnF+no1v1DXyVDsq1GksbY8PdC0keklO1ptPeyEwA7zSFgXt ZisiPutUDgDOF9d06bCyzwd6oDHe9EmC/VPwbfUWstQ5dhxc5+ohkDN4dDsBBWai exqLgmNyLUCs1EfoHspKupMs19p+tSGtoi/FXWCV+VmE5SCmxZMXG9sjhhF9FBFE dz4GN4DyrTDYkR7WUWW5rT5e9RIR12Xk2TWVL08oNMFyDcvX8kMkXUP36SQVmwWa WZgAPs/dX3A8gkx2yiY3qe+vLjkmnsfPgj7qs3NBtXAjQh2gm0E= =BKp0 -----END PGP SIGNATURE----- --=-=-=--