guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

28/28: gnu: java-stringtemplate: Get closer to fixing tests.


From: Ricardo Wurmus
Subject: 28/28: gnu: java-stringtemplate: Get closer to fixing tests.
Date: Tue, 16 May 2017 09:24:37 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit 6db77c7ca1b4f2b1896136684618e30b343bfc1f
Author: Ricardo Wurmus <address@hidden>
Date:   Tue May 16 14:01:58 2017 +0200

    gnu: java-stringtemplate: Get closer to fixing tests.
    
    * gnu/packages/java.scm (java-stringtemplate)[arguments]: Set test-dir and
    override default test target.  Keep tests disabled because they fail for
    unknown reasons.
    [inputs]: Add java-junit.
---
 gnu/packages/java.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bd27d41..188ca7e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3224,13 +3224,20 @@ StringTemplate also powers ANTLR.")
                 "1pri8hqa95rfdkjy55icl5q1m09zwp5k67ib14abas39s4v3w087"))))
     (build-system ant-build-system)
     (arguments
-     `(#:tests? #f
-       #:jar-name (string-append ,name "-" ,version ".jar")
+     `(#:jar-name (string-append ,name "-" ,version ".jar")
+       #:tests? #f ; FIXME: tests fail for unknown reasons
+       #:test-dir "test"
        #:modules ((guix build ant-build-system)
                   (guix build utils)
                   (srfi srfi-1))
        #:phases
        (modify-phases %standard-phases
+         (add-before 'check 'fix-test-target
+           (lambda _
+             (substitute* "build.xml"
+               (("\\$\\{test.home\\}/java") "${test.home}/")
+               (("\\*Test.java") "Test*.java"))
+             #t))
          (add-before 'build 'generate-grammar
            (lambda _
              (with-directory-excursion "src/org/stringtemplate/v4/compiler/"
@@ -3241,7 +3248,8 @@ StringTemplate also powers ANTLR.")
     (inputs
      `(("antlr3" ,antlr3-bootstrap)
        ("antlr2" ,antlr2)
-       ("java-stringtemplate" ,java-stringtemplate-3)))))
+       ("java-stringtemplate" ,java-stringtemplate-3)
+       ("java-junit" ,java-junit)))))
 
 (define java-stringtemplate-4.0.6
   (package (inherit java-stringtemplate)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]