From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42805) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcWai-0000Ui-1n for guix-patches@gnu.org; Sun, 16 Jun 2019 10:57:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcWae-0008DX-4j for guix-patches@gnu.org; Sun, 16 Jun 2019 10:57:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hcWac-0008Bz-5F for guix-patches@gnu.org; Sun, 16 Jun 2019 10:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hcWac-00017L-3a for guix-patches@gnu.org; Sun, 16 Jun 2019 10:57:02 -0400 Subject: [bug#36246] [PATCH] guix import hackage: Add two expected failing test cases. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:42602) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcWZk-0008AN-4N for guix-patches@gnu.org; Sun, 16 Jun 2019 10:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcWZf-0007Im-J4 for guix-patches@gnu.org; Sun, 16 Jun 2019 10:56:07 -0400 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2]:38876 helo=mx2.mailbox.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcWZc-00077J-Aj for guix-patches@gnu.org; Sun, 16 Jun 2019 10:56:01 -0400 From: Robert Vollmert Date: Sun, 16 Jun 2019 16:55:36 +0200 Message-Id: <20190616145536.28758-1-rob@vllmrt.net> 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: 36246@debbugs.gnu.org Cc: Robert Vollmert This adds failing test cases for two hackage import bugs: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25138 https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35743 * tests/hackage.scm: Make comment style consistent. Add two cabal parsing tests, marked as expected failures. --- tests/hackage.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/tests/hackage.scm b/tests/hackage.scm index 14176b2cf9..77e333cbfc 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Federico Beffa +;;; Copyright =C2=A9 2019 Robert Vollmert ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,7 +237,7 @@ library (test-assert "hackage->guix-package test 6" (eval-test-with-cabal test-cabal-6 match-ghc-foo-6)) =20 -;; Check multi-line layouted description +;; Check multi-line layouted description. (define test-cabal-multiline-layout "name: foo version: 1.0.0 @@ -254,7 +255,7 @@ executable cabal (test-assert "hackage->guix-package test multiline desc (layout)" (eval-test-with-cabal test-cabal-multiline-layout match-ghc-foo)) =20 -;; Check multi-line braced description +;; Check multi-line braced description. (define test-cabal-multiline-braced "name: foo version: 1.0.0 @@ -274,6 +275,53 @@ executable cabal (test-assert "hackage->guix-package test multiline desc (braced)" (eval-test-with-cabal test-cabal-multiline-braced match-ghc-foo)) =20 +;; Check mixed layout. Compare e.g. warp. +(define test-cabal-mixed-layout + "name: foo +version: 1.0.0 +homepage: http://test.org +synopsis: synopsis +description: description +license: BSD3 +executable cabal + build-depends: + HTTP >=3D 4000.2.5 && < 4000.3, + mtl >=3D 2.0 && < 3 + ghc-options: -Wall +") + +;; Fails: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35743 +(test-expect-fail 1) +(test-assert "hackage->guix-package test mixed layout" + (eval-test-with-cabal test-cabal-mixed-layout match-ghc-foo)) + +;; Check flag executable. Compare e.g. darcs. +(define test-cabal-flag-executable + "name: foo +version: 1.0.0 +homepage: http://test.org +synopsis: synopsis +description: description +license: BSD3 +flag executable + description: Build executable + default: True +executable cabal + if !flag(executable) + buildable: False + else + buildable: True + + build-depends: + HTTP >=3D 4000.2.5 && < 4000.3, + mtl >=3D 2.0 && < 3 +") + +;; Fails: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25138 +(test-expect-fail 1) +(test-assert "hackage->guix-package test flag executable" + (eval-test-with-cabal test-cabal-flag-executable match-ghc-foo)) + ;; Check Hackage Cabal revisions. (define test-cabal-revision "name: foo --=20 2.20.1 (Apple Git-117)