summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-05-16 14:01:58 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-05-16 15:18:17 +0200
commit6db77c7ca1b4f2b1896136684618e30b343bfc1f (patch)
treeb853a60871a69a16e09449825a9e27b85ca71602 /gnu
parent1345eeb03a25b08d07d9a613531033afd428a8be (diff)
downloadguix-6db77c7ca1b4f2b1896136684618e30b343bfc1f.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm14
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bd27d41e12..188ca7e970 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)