Message ID | 20220208052813.19484-1-ryan@arctype.co |
---|---|
State | Accepted |
Headers | show |
Series | [bug#53868] gnu: clojure-data-xml: Fix test suite | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
This patch is a duplicate of https://debbugs.gnu.org/cgi/bugreport.cgi?bug=53860 with a different approach that only disables the specific failing tests.
Le Mon, 7 Feb 2022 21:28:13 -0800, Ryan Sundberg via Guix-patches via <guix-patches@gnu.org> a écrit : > 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 Thanks for the patch, pushed to master as 6d357541021578914eba7bb33d2529a6744de36d.
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