matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #730 from rgrinberg/test-tweaks 

Test tweaks
This commit is contained in:
Rudi Grinberg 2018-04-28 00:45:44 +07:00 committed by GitHub
parent 8796df8a74 40631805ef
commit 4ef05fb277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/blackbox-tests/gen_tests.ml
View File

@ -89,10 +89,10 @@ end
let exclusions = let exclusions =
let open Test in let open Test in
[ make "js_of_ocaml" ~js:true ~env:("NODE", "${bin:node}") [ make "js_of_ocaml" ~external_deps:true ~js:true ~env:("NODE", "${bin:node}")
; make "github25" ~env:("OCAMLPATH", "./findlib-packages") ; make "github25" ~env:("OCAMLPATH", "./findlib-packages")
; make "odoc" ~external_deps:true ~skip_ocaml:"4.02.3" ; make "odoc" ~external_deps:true ~skip_ocaml:"4.02.3"
; make "multiple-private-libs" ~skip_ocaml:"4.02.3" ; make "multiple-private-libs" ~external_deps:true ~skip_ocaml:"4.02.3"
; make "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true ; make "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true
; make "odoc-unique-mlds" ~skip_ocaml:"4.02.3" ~external_deps:true ; make "odoc-unique-mlds" ~skip_ocaml:"4.02.3" ~external_deps:true
; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0" ; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0"
@ -100,6 +100,7 @@ let exclusions =
; make "private-public-overlap" ~external_deps:true ; make "private-public-overlap" ~external_deps:true
; make "reason" ~enabled:false ; make "reason" ~enabled:false
; make "menhir"~external_deps:true ; make "menhir"~external_deps:true
; make "utop"~external_deps:true
; make "configurator" ~skip_platforms:[Win] ; make "configurator" ~skip_platforms:[Win]
] ]

5
test/blackbox-tests/jbuild.inc
View File

@ -508,13 +508,11 @@
(alias inline_tests) (alias inline_tests)
(alias installable-dup-private-libs) (alias installable-dup-private-libs)
(alias intf-only) (alias intf-only)
(alias js_of_ocaml)
(alias lib-available) (alias lib-available)
(alias loop) (alias loop)
(alias merlin-tests) (alias merlin-tests)
(alias meta-gen) (alias meta-gen)
(alias misc) (alias misc)
(alias multiple-private-libs)
(alias null-dep) (alias null-dep)
(alias ocaml-syntax) (alias ocaml-syntax)
(alias ocamldep-multi-stanzas) (alias ocamldep-multi-stanzas)
@ -525,8 +523,7 @@
(alias redirections) (alias redirections)
(alias scope-bug) (alias scope-bug)
(alias scope-ppx-bug) (alias scope-ppx-bug)
(alias select) (alias select)))))
(alias utop)))))
(alias ((name runtest-disabled) (deps ((alias reason))))) (alias ((name runtest-disabled) (deps ((alias reason)))))

5
test/jbuild
View File

@ -74,3 +74,8 @@ Printf.fprintf (open_out Sys.argv.(2)) \"%g\n%!\" (Sys.time ())
(rule ((targets (08.bar)) (action (run ./incr.exe y ${@})) (locks (m)))) (rule ((targets (08.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
(rule ((targets (09.bar)) (action (run ./incr.exe y ${@})) (locks (m)))) (rule ((targets (09.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
(rule ((targets (10.bar)) (action (run ./incr.exe y ${@})) (locks (m)))) (rule ((targets (10.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
(alias
((name runtest-no-deps)
(deps ((alias_rec blackbox-tests/runtest-no-deps)
(alias_rec unit-tests/runtest)))))