From dcf7a8a660554eb952e6412637e26bb523af03e8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 27 Aug 2017 13:19:31 +0200 Subject: gnu: java-slf4j-api: Fix tests. * gnu/packages/java.scm (java-slf4j-api)[arguments]: Enable tests Adjust the jar content to prevent a test failure. --- gnu/packages/java.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 947598c7b3..fe43d01332 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4171,12 +4171,26 @@ more efficient storage-wise than an uncompressed bitmap (as implemented in the #t)))) (build-system ant-build-system) (arguments - ;; FIXME: org.slf4j.NoBindingTest fails with the ominous "This code - ;; should have never made it into slf4j-api.jar". - `(#:tests? #f - #:jar-name "slf4j-api.jar" + `(#:jar-name "slf4j-api.jar" #:source-dir "slf4j-api/src/main" - #:test-dir "slf4j-api/src/test")) + #:test-dir "slf4j-api/src/test" + #:phases + (modify-phases %standard-phases + (add-after 'build 'regenerate-jar + (lambda _ + ;; pom.xml ignores these files in the jar creation process. If we don't, + ;; we get the error "This code should have never made it into slf4j-api.jar" + (delete-file-recursively "build/classes/org/slf4j/impl") + (zero? (system* "jar" "-cf" "build/jar/slf4j-api.jar" "-C" + "build/classes" ".")))) + (add-before 'check 'dont-test-abstract-classes + (lambda _ + ;; abstract classes are not meant to be run with junit + (substitute* "build.xml" + (("") + (string-append "" + "")))))))) (inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) -- cgit 1.4.1