nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix: ant-build-system: Add #:test-include and #:test-exclude arguments. 

* guix/build-system/ant.scm: Add #:test-include and #:test-exclude
arguments.
* guix/build/ant-build-system.scm: Generate test list from arguments.
* doc/guix.texi (Build Systems): Document it.
This commit is contained in:
Julien Lepiller 2017-09-05 22:14:11 +02:00
parent 8df1faa047
commit f403d7abdf
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guix.texi
View File

@ -3481,7 +3481,11 @@ specify the source sub-directory, defaulting to ``src''.
The @code{#:main-class} parameter can be used with the minimal ant The @code{#:main-class} parameter can be used with the minimal ant
buildfile to specify the main class of the resulting jar. This makes the buildfile to specify the main class of the resulting jar. This makes the
jar file executable. jar file executable. The @code{#:test-include} parameter can be used to
specify the list of junit tests to run. It defaults to
@code{(list "**/*Test.java")}. The @code{#:test-exclude} can be used to
disable some tests. It defaults to @code{(list "**/Abstract*.java")},
because abstract classes cannot be run as tests.
The parameter @code{#:build-target} can be used to specify the Ant task The parameter @code{#:build-target} can be used to specify the Ant task
that should be run during the @code{build} phase. By default the that should be run during the @code{build} phase. By default the

4
guix/build-system/ant.scm
View File

@ -100,6 +100,8 @@
(build-target "jar") (build-target "jar")
(jar-name #f) (jar-name #f)
(main-class #f) (main-class #f)
(test-include (list "**/*Test.java"))
(test-exclude (list "**/Abstract*.java"))
(source-dir "src") (source-dir "src")
(test-dir "src/test") (test-dir "src/test")
(phases '(@ (guix build ant-build-system) (phases '(@ (guix build ant-build-system)
@ -132,6 +134,8 @@
#:build-target ,build-target #:build-target ,build-target
#:jar-name ,jar-name #:jar-name ,jar-name
#:main-class ,main-class #:main-class ,main-class
#:test-include (list ,@test-include)
#:test-exclude (list ,@test-exclude)
#:source-dir ,source-dir #:source-dir ,source-dir
#:test-dir ,test-dir #:test-dir ,test-dir
#:phases ,phases #:phases ,phases

17
guix/build/ant-build-system.scm
View File

@ -36,7 +36,9 @@
;; Code: ;; Code:
(define* (default-build.xml jar-name prefix #:optional (define* (default-build.xml jar-name prefix #:optional
(source-dir ".") (test-dir "./test") (main-class #f)) (source-dir ".") (test-dir "./test") (main-class #f)
(test-include '("**/*Test.java"))
(test-exclude '("**/Abstract*Test.java")))
"Create a simple build.xml with standard targets for Ant." "Create a simple build.xml with standard targets for Ant."
(call-with-output-file "build.xml" (call-with-output-file "build.xml"
(lambda (port) (lambda (port)
@ -109,7 +111,12 @@
(batchtest (@ (fork "yes") (batchtest (@ (fork "yes")
(todir "${test.home}/test-reports")) (todir "${test.home}/test-reports"))
(fileset (@ (dir "${test.home}/java")) (fileset (@ (dir "${test.home}/java"))
(include (@ (name "**/*Test.java" ))))))) ,@(map (lambda (file)
`(include (@ (name ,file))))
test-include)
,@(map (lambda (file)
`(exclude (@ (name ,file))))
test-exclude)))))
(target (@ (name "jar") (target (@ (name "jar")
(depends "compile, manifest")) (depends "compile, manifest"))
@ -150,12 +157,14 @@ to the default GNU unpack strategy."
(define* (configure #:key inputs outputs (jar-name #f) (define* (configure #:key inputs outputs (jar-name #f)
(source-dir "src") (source-dir "src")
(test-dir "src/test") (test-dir "src/test")
(main-class #f) #:allow-other-keys) (main-class #f)
(test-include '("**/*Test.java"))
(test-exclude '("**/Abstract*.java")) #:allow-other-keys)
(when jar-name (when jar-name
(default-build.xml jar-name (default-build.xml jar-name
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/java") "/share/java")
source-dir test-dir main-class)) source-dir test-dir main-class test-include test-exclude))
(setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
(setenv "CLASSPATH" (generate-classpath inputs))) (setenv "CLASSPATH" (generate-classpath inputs)))