From patchwork Tue Feb 8 05:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 37081 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 81BF527BBEA; Tue, 8 Feb 2022 05:29:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 25DF027BBE9 for ; Tue, 8 Feb 2022 05:29:13 +0000 (GMT) Received: from localhost ([::1]:51216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHJ3w-0004uG-9K for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 00:29:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHJ3m-0004tu-GL for guix-patches@gnu.org; Tue, 08 Feb 2022 00:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHJ3m-0002V6-6E for guix-patches@gnu.org; Tue, 08 Feb 2022 00:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHJ3l-0000N3-TX for guix-patches@gnu.org; Tue, 08 Feb 2022 00:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53868] [PATCH] gnu: clojure-data-xml: Fix test suite Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 05:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53868@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16442981381411 (code B ref -1); Tue, 08 Feb 2022 05:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2022 05:28:58 +0000 Received: from localhost ([127.0.0.1]:44741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHJ3h-0000Mh-QW for submit@debbugs.gnu.org; Tue, 08 Feb 2022 00:28:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:53298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHJ3g-0000MZ-1s for submit@debbugs.gnu.org; Tue, 08 Feb 2022 00:28:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHJ3f-0004sq-Om for guix-patches@gnu.org; Tue, 08 Feb 2022 00:28:55 -0500 Received: from mail.arctype.co ([138.68.9.245]:59295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHJ3d-0002UI-RC for guix-patches@gnu.org; Tue, 08 Feb 2022 00:28:55 -0500 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 0D46F13B136; Tue, 8 Feb 2022 05:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=arctype.co; s=mail; t=1644298101; bh=rOkxxlQ22qZ/4mWnsKZ+yJN6+KIJIPB2ysVs8hAJVd0=; h=From:To:Cc:Subject:Date:From; b=JovSoW/qLGHZ3Du75IvyWNLWnyPwlr0qlygRba2bZJNPeg192fv7Pkxeyl+AbbCIt 5YNaKojuAu/JEY7jNKF2fIY1nlXZeRmydTqrNUM+hJRR9BHkmbWX0kmxCQ0FgTJGx5 8SlQxvnDBOYmq4YefpzvNJR9OaaVLlJC9q+zxq8z691mtnh8lglNlybuUE0eTwC3q2 qd2Vj8+F1luYsY8d+76ZDRkJRrLflJEK9K8ANDzRTiy+dba9M2akmTXuNefK6Wyv3r c9ba3WCPBLAfbGOwK8eTssC2oRzJFlL4gXQ5wh++Fg14DF+1KzNUO06HRWjHVV8kr4 0qBx5DSqD8AWg== Date: Mon, 7 Feb 2022 21:28:13 -0800 Message-Id: <20220208052813.19484-1-ryan@arctype.co> MIME-Version: 1.0 Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches Removes clojurescript related tests that interfere with the JDK clojure test suite, causing it to fail. * gnu/packages/clojure.scm (clojure-data-xml)[arguments]: Add 'delete-cljs-tests phase --- gnu/packages/clojure.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 2a9ad90740..3ee4941ddb 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -441,8 +441,14 @@ (define-public clojure-data-xml (build-system clojure-build-system) (arguments '(#:source-dirs '("src/main/clojure") - #:test-dirs '("src/test/clojure") - #:doc-dirs '())) + #:test-dirs '("src/test/clojure" "src/test/resources") + #:doc-dirs '() + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-cljs-tests + (lambda _ + (delete-file "src/test/resources/clojure/data/xml/cljs_testsuite.clj") + (delete-file "src/test/clojure/clojure/data/xml/test_cljs.clj")))))) (propagated-inputs (list clojure-data-codec)) (synopsis "Clojure library for reading and writing XML data") (description "@code{data.xml} is a Clojure library for reading and writing