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

Simplify a bit blackbox tests 

- make them depend on (package jbuilder)
- s/$JBUILDER/jbuilder/
This commit is contained in:
Jeremie Dimino 2018-03-29 10:54:36 -04:00 committed by Rudi Grinberg
parent 244773ef80
commit 24de79934b
46 changed files with 328 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

458
test/blackbox-tests/jbuild
View File

@ -8,454 +8,454 @@
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/redirections))) (deps ((package jbuilder)
(files_recursively_in test-cases/redirections)))
(action (action
(chdir test-cases/redirections (chdir test-cases/redirections
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/misc))) (deps ((package jbuilder)
(files_recursively_in test-cases/misc)))
(action (action
(chdir test-cases/misc (chdir test-cases/misc
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github20))) (deps ((package jbuilder)
(files_recursively_in test-cases/github20)))
(action (action
(chdir test-cases/github20 (chdir test-cases/github20
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest-js) ((name runtest-js)
(deps ((files_recursively_in test-cases/js_of_ocaml))) (deps ((package jbuilder)
(files_recursively_in test-cases/js_of_ocaml)))
(action (action
(chdir test-cases/js_of_ocaml (chdir test-cases/js_of_ocaml
(setenv JBUILDER ${bin:jbuilder} (setenv NODE ${bin:node}
(setenv NODE ${bin:node} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected)))))))
(diff? run.t run.t.corrected))))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github24))) (deps ((package jbuilder)
(files_recursively_in test-cases/github24)))
(action (action
(chdir test-cases/github24 (chdir test-cases/github24
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/menhir))) (deps ((package jbuilder)
(files_recursively_in test-cases/menhir)))
(action (action
(chdir test-cases/menhir (chdir test-cases/menhir
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github25))) (deps ((package jbuilder)
(files_recursively_in test-cases/github25)))
(action (action
(chdir test-cases/github25/root (chdir test-cases/github25/root
(setenv OCAMLPATH ../findlib-packages (setenv OCAMLPATH ../findlib-packages
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected)))))))
(diff? run.t run.t.corrected))))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/lib-available))) (deps ((package jbuilder)
(files_recursively_in test-cases/lib-available)))
(action (action
(chdir test-cases/lib-available (chdir test-cases/lib-available
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/copy_files))) (deps ((package jbuilder)
(files_recursively_in test-cases/copy_files)))
(action (action
(chdir test-cases/copy_files (chdir test-cases/copy_files
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/aliases))) (deps ((package jbuilder)
(files_recursively_in test-cases/aliases)))
(action (action
(chdir test-cases/aliases (chdir test-cases/aliases
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/force-test))) (deps ((package jbuilder)
(files_recursively_in test-cases/force-test)))
(action (action
(chdir test-cases/force-test (chdir test-cases/force-test
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/meta-gen))) (deps ((package jbuilder)
(files_recursively_in test-cases/meta-gen)))
(action (action
(chdir test-cases/meta-gen (chdir test-cases/meta-gen
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/exec-cmd))) (deps ((package jbuilder)
(files_recursively_in test-cases/exec-cmd)))
(action (action
(chdir test-cases/exec-cmd (chdir test-cases/exec-cmd
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/ocaml-syntax))) (deps ((package jbuilder)
(files_recursively_in test-cases/ocaml-syntax)))
(action (action
(chdir test-cases/ocaml-syntax (chdir test-cases/ocaml-syntax
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/gen-opam-install-file))) (deps ((package jbuilder)
(files_recursively_in test-cases/gen-opam-install-file)))
(action (action
(chdir test-cases/gen-opam-install-file (chdir test-cases/gen-opam-install-file
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest-skipped) ((name runtest-skipped)
(deps ((files_recursively_in test-cases/reason))) (deps ((package jbuilder)
(files_recursively_in test-cases/reason)))
(action (action
(chdir test-cases/reason (chdir test-cases/reason
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/odoc))) (deps ((package jbuilder)
(files_recursively_in test-cases/odoc)))
(action (action
(chdir test-cases/odoc (chdir test-cases/odoc
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
(run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/select))) (deps ((package jbuilder)
(files_recursively_in test-cases/select)))
(action (action
(chdir test-cases/select (chdir test-cases/select
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/multiple-private-libs))) (deps ((package jbuilder)
(files_recursively_in test-cases/multiple-private-libs)))
(action (action
(chdir test-cases/multiple-private-libs (chdir test-cases/multiple-private-libs
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
(run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/ppx-rewriter))) (deps ((package jbuilder)
(files_recursively_in test-cases/ppx-rewriter)))
(action (action
(chdir test-cases/ppx-rewriter (chdir test-cases/ppx-rewriter
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
(run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/utop))) (deps ((package jbuilder)
(files_recursively_in test-cases/utop)))
(action (action
(chdir test-cases/utop (chdir test-cases/utop
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/c-stubs))) (deps ((package jbuilder)
(files_recursively_in test-cases/c-stubs)))
(action (action
(chdir test-cases/c-stubs (chdir test-cases/c-stubs
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/cross-compilation))) (deps ((package jbuilder)
(files_recursively_in test-cases/cross-compilation)))
(action (action
(chdir test-cases/cross-compilation (chdir test-cases/cross-compilation
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/promote))) (deps ((package jbuilder)
(files_recursively_in test-cases/promote)))
(action (action
(chdir test-cases/promote (chdir test-cases/promote
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/include-loop))) (deps ((package jbuilder)
(files_recursively_in test-cases/include-loop)))
(action (action
(chdir test-cases/include-loop (chdir test-cases/include-loop
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/scope-bug))) (deps ((package jbuilder)
(files_recursively_in test-cases/scope-bug)))
(action (action
(chdir test-cases/scope-bug (chdir test-cases/scope-bug
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/scope-ppx-bug))) (deps ((package jbuilder)
(files_recursively_in test-cases/scope-ppx-bug)))
(action (action
(chdir test-cases/scope-ppx-bug (chdir test-cases/scope-ppx-bug
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/loop))) (deps ((package jbuilder)
(files_recursively_in test-cases/loop)))
(action (action
(chdir test-cases/loop (chdir test-cases/loop
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/intf-only))) (deps ((package jbuilder)
(files_recursively_in test-cases/intf-only)))
(action (action
(chdir test-cases/intf-only (chdir test-cases/intf-only
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/installable-dup-private-libs))) (deps ((package jbuilder)
(files_recursively_in test-cases/installable-dup-private-libs)))
(action (action
(chdir test-cases/installable-dup-private-libs (chdir test-cases/installable-dup-private-libs
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/inline_tests))) (deps ((package jbuilder)
(files_recursively_in test-cases/inline_tests)))
(action (action
(chdir test-cases/inline_tests (chdir test-cases/inline_tests
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/byte-code-only))) (deps ((package jbuilder)
(files_recursively_in test-cases/byte-code-only)))
(action (action
(chdir test-cases/byte-code-only (chdir test-cases/byte-code-only
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/merlin-tests))) (deps ((package jbuilder)
(files_recursively_in test-cases/merlin-tests)))
(action (action
(chdir test-cases/merlin-tests (chdir test-cases/merlin-tests
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/findlib))) (deps ((package jbuilder)
(files_recursively_in test-cases/findlib)))
(action (action
(chdir test-cases/findlib (chdir test-cases/findlib
(setenv OCAMLPATH findlib-packages (setenv OCAMLPATH findlib-packages
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected)))))))
(diff? run.t run.t.corrected))))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/odoc-unique-mlds))) (deps ((package jbuilder)
(files_recursively_in test-cases/odoc-unique-mlds)))
(action (action
(chdir test-cases/odoc-unique-mlds (chdir test-cases/odoc-unique-mlds
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
(run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/ocamldep-multi-stanzas))) (deps ((package jbuilder)
(files_recursively_in test-cases/ocamldep-multi-stanzas)))
(action (action
(chdir test-cases/ocamldep-multi-stanzas (chdir test-cases/ocamldep-multi-stanzas
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/exclude-missing-module))) (deps ((package jbuilder)
(files_recursively_in test-cases/exclude-missing-module)))
(action (action
(chdir test-cases/exclude-missing-module (chdir test-cases/exclude-missing-module
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github534))) (deps ((package jbuilder)
(files_recursively_in test-cases/github534)))
(action (action
(chdir test-cases/github534 (chdir test-cases/github534
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github568))) (deps ((package jbuilder)
(files_recursively_in test-cases/github568)))
(action (action
(chdir test-cases/github568 (chdir test-cases/github568
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/output-obj))) (deps ((package jbuilder)
(files_recursively_in test-cases/output-obj)))
(action (action
(chdir test-cases/output-obj (chdir test-cases/output-obj
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions <4.06.0
(run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions <4.06.0 run.t)
run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github597))) (deps ((package jbuilder)
(files_recursively_in test-cases/github597)))
(action (action
(chdir test-cases/github597 (chdir test-cases/github597
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/private-public-overlap))) (deps ((package jbuilder)
(files_recursively_in test-cases/private-public-overlap)))
(action (action
(chdir test-cases/private-public-overlap (chdir test-cases/private-public-overlap
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/depend-on-the-universe))) (deps ((package jbuilder)
(files_recursively_in test-cases/depend-on-the-universe)))
(action (action
(chdir test-cases/depend-on-the-universe (chdir test-cases/depend-on-the-universe
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/package-dep))) (deps ((package jbuilder)
(files_recursively_in test-cases/package-dep)))
(action (action
(chdir test-cases/package-dep (chdir test-cases/package-dep
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))
(alias (alias
((name runtest) ((name runtest)
(deps ((files_recursively_in test-cases/github644))) (deps ((package jbuilder)
(files_recursively_in test-cases/github644)))
(action (action
(chdir test-cases/github644 (chdir test-cases/github644
(setenv JBUILDER ${bin:jbuilder} (progn
(progn (run ${exe:cram.exe} run.t)
(run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))
(diff? run.t run.t.corrected)))))))

16
test/blackbox-tests/test-cases/aliases/run.t
View File

@ -1,22 +1,22 @@
$ $JBUILDER clean -j1 --display short --root . $ jbuilder clean -j1 --display short --root .
$ $JBUILDER build -j1 --display short --root . @just-in-src $ jbuilder build -j1 --display short --root . @just-in-src
running in src running in src
$ $JBUILDER clean -j1 --display short --root . $ jbuilder clean -j1 --display short --root .
$ $JBUILDER build -j1 --display short --root . @everywhere $ jbuilder build -j1 --display short --root . @everywhere
running in src/foo/bar running in src/foo/bar
running in src/foo/baz running in src/foo/baz
running in src running in src
$ $JBUILDER clean -j1 --display short --root . $ jbuilder clean -j1 --display short --root .
$ $JBUILDER build -j1 --display short --root . @x $ jbuilder build -j1 --display short --root . @x
running in src/foo/bar running in src/foo/bar
running in src/foo/baz running in src/foo/baz
running in src running in src
$ $JBUILDER build -j1 --display short --root . @plop $ jbuilder build -j1 --display short --root . @plop
From the command line: From the command line:
Error: Alias plop is empty. Error: Alias plop is empty.
It is not defined in . or any of its descendants. It is not defined in . or any of its descendants.
[1] [1]
$ $JBUILDER build -j1 --display short --root . @truc/x $ jbuilder build -j1 --display short --root . @truc/x
From the command line: From the command line:
Error: Don't know about directory truc! Error: Don't know about directory truc!
[1] [1]

4
test/blackbox-tests/test-cases/byte-code-only/run.t
View File

@ -1,4 +1,4 @@
$ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" $JBUILDER build --root . -j1 --display short $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short
ocamldep bin/toto.ml.d ocamldep bin/toto.ml.d
ocamlc bin/.toto.eobjs/toto.{cmi,cmo,cmt} ocamlc bin/.toto.eobjs/toto.{cmi,cmo,cmt}
ocamlc bin/toto.exe ocamlc bin/toto.exe
@ -7,6 +7,6 @@
ocamlc src/foo.cma ocamlc src/foo.cma
Check that building a native only executable fails Check that building a native only executable fails
$ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" $JBUILDER build --root . -j1 --display short native-only/foo.exe $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" jbuilder build --root . -j1 --display short native-only/foo.exe
Don't know how to build native-only/foo.exe Don't know how to build native-only/foo.exe
[1] [1]

4
test/blackbox-tests/test-cases/c-stubs/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER exec -j1 ./qnativerun/run.exe --display short --root . $ jbuilder exec -j1 ./qnativerun/run.exe --display short --root .
ocamldep qnativerun/run.ml.d ocamldep qnativerun/run.ml.d
ocamlc q/q_stub.o ocamlc q/q_stub.o
ocamlmklib q/dllq_stubs.so,q/libq_stubs.a ocamlmklib q/dllq_stubs.so,q/libq_stubs.a
@ -11,4 +11,4 @@
ocamlopt qnativerun/.run.eobjs/run.{cmx,o} ocamlopt qnativerun/.run.eobjs/run.{cmx,o}
ocamlopt qnativerun/run.exe ocamlopt qnativerun/run.exe
42 42
# $ $JBUILDER exec -j1 ./qbyterun/run.bc --display short --root . # $ jbuilder exec -j1 ./qbyterun/run.bc --display short --root .

4
test/blackbox-tests/test-cases/copy_files/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 test.exe .merlin --display short --root . --debug-dependency-path $ jbuilder build -j1 test.exe .merlin --display short --root . --debug-dependency-path
ocamllex lexers/lexer1.ml ocamllex lexers/lexer1.ml
ocamldep lexer1.ml.d ocamldep lexer1.ml.d
ocamldep test.ml.d ocamldep test.ml.d
@ -13,6 +13,6 @@
ocamlopt .test.eobjs/test.{cmx,o} ocamlopt .test.eobjs/test.{cmx,o}
ocamlopt foo.{a,cmxa} ocamlopt foo.{a,cmxa}
ocamlopt test.exe ocamlopt test.exe
$ $JBUILDER build -j1 @bar-source --display short --root . $ jbuilder build -j1 @bar-source --display short --root .
#line 1 "include/bar.h" #line 1 "include/bar.h"
int foo () {return 42;} int foo () {return 42;}

2
test/blackbox-tests/test-cases/cross-compilation/run.t
View File

@ -1,4 +1,4 @@
$ env OCAMLFIND_CONF=$PWD/etc/findlib.conf $JBUILDER build --display short --root . -j1 -x foo file @install $ env OCAMLFIND_CONF=$PWD/etc/findlib.conf jbuilder build --display short --root . -j1 -x foo file @install
ocamldep bin/blah.ml.d [default.foo] ocamldep bin/blah.ml.d [default.foo]
ocamldep lib/p.ml.d [default.foo] ocamldep lib/p.ml.d [default.foo]
ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo] ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo]

10
test/blackbox-tests/test-cases/depend-on-the-universe/run.t
View File

@ -1,10 +1,10 @@
$ $JBUILDER build --root . -j 1 --display quiet @x $ jbuilder build --root . -j 1 --display quiet @x
Hello, world! Hello, world!
$ $JBUILDER build --root . -j 1 --display quiet @x $ jbuilder build --root . -j 1 --display quiet @x
Hello, world! Hello, world!
$ $JBUILDER build --root . -j 1 --display quiet @x $ jbuilder build --root . -j 1 --display quiet @x
Hello, world! Hello, world!
$ $JBUILDER build --root . -j 1 --display quiet @x $ jbuilder build --root . -j 1 --display quiet @x
Hello, world! Hello, world!
$ $JBUILDER build --root . -j 1 --display quiet @x $ jbuilder build --root . -j 1 --display quiet @x
Hello, world! Hello, world!

2
test/blackbox-tests/test-cases/exclude-missing-module/run.t
View File

@ -1,3 +1,3 @@
$ $JBUILDER build --display short --root . -j 1 $ jbuilder build --display short --root . -j 1
File "jbuild", line 3, characters 24-28: File "jbuild", line 3, characters 24-28:
Warning: Module Fake is excluded but it doesn't exist. Warning: Module Fake is excluded but it doesn't exist.

12
test/blackbox-tests/test-cases/exec-cmd/run.t
View File

@ -1,22 +1,22 @@
$ $JBUILDER clean -j1 --display short --root . $ jbuilder clean -j1 --display short --root .
$ $JBUILDER exec --no-build ./foo.exe -j1 --display short --root . $ jbuilder exec --no-build ./foo.exe -j1 --display short --root .
Error: Program "./foo.exe" isn't built yet you need to buid it first or remove the --no-build option. Error: Program "./foo.exe" isn't built yet you need to buid it first or remove the --no-build option.
[1] [1]
$ $JBUILDER exec ./foo.exe -j1 --display short --root . $ jbuilder exec ./foo.exe -j1 --display short --root .
ocamldep foo.ml.d ocamldep foo.ml.d
ocamlc .foo.eobjs/foo.{cmi,cmo,cmt} ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
ocamlopt .foo.eobjs/foo.{cmx,o} ocamlopt .foo.eobjs/foo.{cmx,o}
ocamlopt foo.exe ocamlopt foo.exe
Foo Foo
$ $JBUILDER exec --dev ./foo.exe -j1 --display short --root . $ jbuilder exec --dev ./foo.exe -j1 --display short --root .
ocamlc .foo.eobjs/foo.{cmi,cmo,cmt} ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
ocamlopt .foo.eobjs/foo.{cmx,o} ocamlopt .foo.eobjs/foo.{cmx,o}
ocamlopt foo.exe ocamlopt foo.exe
Foo Foo
$ $JBUILDER exec dunetestbar --no-build -j1 --display short --root . $ jbuilder exec dunetestbar --no-build -j1 --display short --root .
Error: Program "dunetestbar" isn't built yet you need to buid it first or remove the --no-build option. Error: Program "dunetestbar" isn't built yet you need to buid it first or remove the --no-build option.
[1] [1]
$ $JBUILDER exec dunetestbar -j1 --display short --root . $ jbuilder exec dunetestbar -j1 --display short --root .
ocamldep bar.ml.d ocamldep bar.ml.d
ocamlc .bar.eobjs/bar.{cmi,cmo,cmt} ocamlc .bar.eobjs/bar.{cmi,cmo,cmt}
ocamlopt .bar.eobjs/bar.{cmx,o} ocamlopt .bar.eobjs/bar.{cmx,o}

4
test/blackbox-tests/test-cases/findlib/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER external-lib-deps --root . -j1 --display quiet @install $ jbuilder external-lib-deps --root . -j1 --display quiet @install
These are the external library dependencies in the default context: These are the external library dependencies in the default context:
- a - a
- b - b
@ -6,7 +6,7 @@
Reproduction case for #484. The error should point to src/jbuild Reproduction case for #484. The error should point to src/jbuild
$ $JBUILDER build --root . -j1 --display quiet @install $ jbuilder build --root . -j1 --display quiet @install
File "src/jbuild", line 4, characters 16-17: File "src/jbuild", line 4, characters 16-17:
Error: Library "a" not found. Error: Library "a" not found.
Hint: try: jbuilder external-lib-deps --missing --root . @install Hint: try: jbuilder external-lib-deps --missing --root . @install

8
test/blackbox-tests/test-cases/force-test/run.t
View File

@ -1,12 +1,12 @@
$ $JBUILDER clean -j1 --display short --root . $ jbuilder clean -j1 --display short --root .
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
ocamldep f.ml.d ocamldep f.ml.d
ocamlc .f.eobjs/f.{cmi,cmo,cmt} ocamlc .f.eobjs/f.{cmi,cmo,cmt}
ocamlopt .f.eobjs/f.{cmx,o} ocamlopt .f.eobjs/f.{cmx,o}
ocamlopt f.exe ocamlopt f.exe
f alias runtest f alias runtest
Foo Bar Foo Bar
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
$ $JBUILDER runtest --force -j1 --display short --root . $ jbuilder runtest --force -j1 --display short --root .
f alias runtest f alias runtest
Foo Bar Foo Bar

2
test/blackbox-tests/test-cases/gen-opam-install-file/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
ocamldep bar.ml.d ocamldep bar.ml.d
ocamldep foo_byte.ml.d ocamldep foo_byte.ml.d
ocamlc .foo_byte.objs/foo_byte.{cmi,cmo,cmt} ocamlc .foo_byte.objs/foo_byte.{cmi,cmo,cmt}

2
test/blackbox-tests/test-cases/github20/run.t
View File

@ -1 +1 @@
$ $JBUILDER build -j1 .merlin --display short --root . $ jbuilder build -j1 .merlin --display short --root .

2
test/blackbox-tests/test-cases/github24/run.t
View File

@ -1 +1 @@
$ $JBUILDER build -j1 @install --display short --root . --debug-dependency-path $ jbuilder build -j1 @install --display short --root . --debug-dependency-path

4
test/blackbox-tests/test-cases/github25/root/run.t
View File

@ -6,14 +6,14 @@ problem. So jbuilder shouldn't crash because of "plop.ca-marche-pas"
We need ocamlfind to run this test We need ocamlfind to run this test
$ $JBUILDER build -j1 @install --display short --root . --only hello $ jbuilder build -j1 @install --display short --root . --only hello
ocamlc .hello.objs/hello.{cmi,cmo,cmt} ocamlc .hello.objs/hello.{cmi,cmo,cmt}
ocamlopt .hello.objs/hello.{cmx,o} ocamlopt .hello.objs/hello.{cmx,o}
ocamlopt hello.{a,cmxa} ocamlopt hello.{a,cmxa}
ocamlopt hello.cmxs ocamlopt hello.cmxs
ocamlc hello.cma ocamlc hello.cma
$ $JBUILDER build -j1 @install --display short --root . --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../' $ jbuilder build -j1 @install --display short --root . --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../'
ocamldep a.ml.d ocamldep a.ml.d
File ".../plop/META", line 1, characters 0-0: File ".../plop/META", line 1, characters 0-0:
Error: Library "une-lib-qui-nexiste-pas" not found. Error: Library "une-lib-qui-nexiste-pas" not found.

2
test/blackbox-tests/test-cases/github534/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER exec ./main.exe --root . -j1 --display short $ jbuilder exec ./main.exe --root . -j1 --display short
echo main.ml echo main.ml
ocamldep main.ml.d ocamldep main.ml.d
ocamlc .main.eobjs/main.{cmi,cmo,cmt} ocamlc .main.eobjs/main.{cmi,cmo,cmt}

2
test/blackbox-tests/test-cases/github568/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest --display short -j1 -p lib1 --debug-dependency-path $ jbuilder runtest --display short -j1 -p lib1 --debug-dependency-path
ocamldep test1.ml.d ocamldep test1.ml.d
ocamldep lib1.ml.d ocamldep lib1.ml.d
ocamlc .lib1.objs/lib1.{cmi,cmo,cmt} ocamlc .lib1.objs/lib1.{cmi,cmo,cmt}

2
test/blackbox-tests/test-cases/github597/run.t
View File

@ -1 +1 @@
$ $JBUILDER build --root . -j1 --display quiet b/b.cma $ jbuilder build --root . -j1 --display quiet b/b.cma

6
test/blackbox-tests/test-cases/github644/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest --root . -j 1 --display quiet $ jbuilder runtest --root . -j 1 --display quiet
File "jbuild", line 4, characters 20-42: File "jbuild", line 4, characters 20-42:
Error: Library "ppx_that_doesn't_exist" not found. Error: Library "ppx_that_doesn't_exist" not found.
Hint: try: jbuilder external-lib-deps --missing --root . @runtest Hint: try: jbuilder external-lib-deps --missing --root . @runtest
@ -6,6 +6,6 @@
These should print something: These should print something:
$ $JBUILDER external-lib-deps --root . -j 1 --display quiet @runtest $ jbuilder external-lib-deps --root . -j 1 --display quiet @runtest
$ $JBUILDER external-lib-deps --root . -j 1 --display quiet --missing @runtest $ jbuilder external-lib-deps --root . -j 1 --display quiet --missing @runtest

2
test/blackbox-tests/test-cases/include-loop/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build --display short --root . -j 1 $ jbuilder build --display short --root . -j 1
File "jbuild", line 2, characters 0-15: File "jbuild", line 2, characters 0-15:
Error: Recursive inclusion of jbuild files detected: Error: Recursive inclusion of jbuild files detected:
File a.inc is included from c.inc:2 File a.inc is included from c.inc:2

10
test/blackbox-tests/test-cases/inline_tests/run.t
View File

@ -1,26 +1,26 @@
$ env -u OCAMLRUNPARAM $JBUILDER runtest simple -j1 --display quiet --root . $ env -u OCAMLRUNPARAM jbuilder runtest simple -j1 --display quiet --root .
run alias simple/runtest (exit 2) run alias simple/runtest (exit 2)
(cd _build/default/simple && ./.foo_simple.inline-tests/run.exe) (cd _build/default/simple && ./.foo_simple.inline-tests/run.exe)
Fatal error: exception File "simple/.foo_simple.inline-tests/run.ml", line 1, characters 10-16: Assertion failed Fatal error: exception File "simple/.foo_simple.inline-tests/run.ml", line 1, characters 10-16: Assertion failed
[1] [1]
$ $JBUILDER runtest missing-backend -j1 --display quiet --root . $ jbuilder runtest missing-backend -j1 --display quiet --root .
File "missing-backend/jbuild", line 3, characters 2-16: File "missing-backend/jbuild", line 3, characters 2-16:
Error: No inline tests backend found. Error: No inline tests backend found.
[1] [1]
$ $JBUILDER runtest too-many-backends -j1 --display quiet --root . $ jbuilder runtest too-many-backends -j1 --display quiet --root .
File "too-many-backends/jbuild", line 17, characters 2-16: File "too-many-backends/jbuild", line 17, characters 2-16:
Error: Too many independant inline tests backends found: Error: Too many independant inline tests backends found:
- "backend_tmb1" in _build/default/too-many-backends - "backend_tmb1" in _build/default/too-many-backends
- "backend_tmb2" in _build/default/too-many-backends - "backend_tmb2" in _build/default/too-many-backends
[1] [1]
$ $JBUILDER runtest many-backends-choose -j1 --display quiet --root . $ jbuilder runtest many-backends-choose -j1 --display quiet --root .
run alias many-backends-choose/runtest run alias many-backends-choose/runtest
backend_mbc1 backend_mbc1
$ $JBUILDER runtest dune-file -j1 --display quiet --root . $ jbuilder runtest dune-file -j1 --display quiet --root .
(dune (dune
1 1
((inline_tests.backend ((inline_tests.backend

2
test/blackbox-tests/test-cases/installable-dup-private-libs/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build @install -j1 --display short --root . $ jbuilder build @install -j1 --display short --root .
ocamldep a1/a.ml.d ocamldep a1/a.ml.d
ocamlc a1/.a.objs/a.{cmi,cmo,cmt} ocamlc a1/.a.objs/a.{cmi,cmo,cmt}
ocamlopt a1/.a.objs/a.{cmx,o} ocamlopt a1/.a.objs/a.{cmx,o}

10
test/blackbox-tests/test-cases/intf-only/run.t
View File

@ -1,6 +1,6 @@
Successes: Successes:
$ $JBUILDER build --display short --root foo -j1 --debug-dep 2>&1 | grep -v Entering $ jbuilder build --display short --root foo -j1 --debug-dep 2>&1 | grep -v Entering
ocamldep test/bar.ml.d ocamldep test/bar.ml.d
ocamldep foo.ml.d ocamldep foo.ml.d
ocamlc .foo.objs/foo__.{cmi,cmo,cmt} ocamlc .foo.objs/foo__.{cmi,cmo,cmt}
@ -20,7 +20,7 @@ Successes:
Errors: Errors:
$ $JBUILDER build --display short --root a -j1 foo.cma 2>&1 | grep -v Entering $ jbuilder build --display short --root a -j1 foo.cma 2>&1 | grep -v Entering
File "jbuild", line 2, characters 1-13: File "jbuild", line 2, characters 1-13:
Warning: Some modules don't have an implementation. Warning: Some modules don't have an implementation.
You need to add the following field to this stanza: You need to add the following field to this stanza:
@ -30,16 +30,16 @@ Errors:
This will become an error in the future. This will become an error in the future.
ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc .foo.objs/foo.{cmi,cmo,cmt}
ocamlc foo.cma ocamlc foo.cma
$ $JBUILDER build --display short --root b -j1 foo.cma 2>&1 | grep -v Entering $ jbuilder build --display short --root b -j1 foo.cma 2>&1 | grep -v Entering
File "jbuild", line 3, characters 34-37: File "jbuild", line 3, characters 34-37:
Warning: The following modules must be listed here as they don't have an implementation: Warning: The following modules must be listed here as they don't have an implementation:
- y - y
This will become an error in the future. This will become an error in the future.
ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc .foo.objs/foo.{cmi,cmo,cmt}
ocamlc foo.cma ocamlc foo.cma
$ $JBUILDER build --display short --root c -j1 foo.cma 2>&1 | grep -v Entering $ jbuilder build --display short --root c -j1 foo.cma 2>&1 | grep -v Entering
File "jbuild", line 3, characters 35-36: File "jbuild", line 3, characters 35-36:
Error: Module X doesn't exist. Error: Module X doesn't exist.
$ $JBUILDER build --display short --root d -j1 foo.cma 2>&1 | grep -v Entering $ jbuilder build --display short --root d -j1 foo.cma 2>&1 | grep -v Entering
File "jbuild", line 3, characters 35-36: File "jbuild", line 3, characters 35-36:
Error: Module X has an implementation, it cannot be listed here Error: Module X has an implementation, it cannot be listed here

4
test/blackbox-tests/test-cases/js_of_ocaml/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js $ jbuilder build -j1 --display short --root . --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js
ocamlc lib/stubs.o ocamlc lib/stubs.o
ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a
ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe
@ -34,7 +34,7 @@
use it use it
break it break it
fix it fix it
$ $JBUILDER build -j1 --display short --root . bin/technologic.bc.js @install $ jbuilder build -j1 --display short --root . bin/technologic.bc.js @install
ocamlc lib/.x.objs/x__.{cmi,cmo,cmt} ocamlc lib/.x.objs/x__.{cmi,cmo,cmt}
ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt} ocamlc lib/.x.objs/x__Y.{cmi,cmo,cmt}
ocamlc lib/.x.objs/x.{cmi,cmo,cmt} ocamlc lib/.x.objs/x.{cmi,cmo,cmt}

2
test/blackbox-tests/test-cases/lib-available/run.t
View File

@ -1,3 +1,3 @@
$ $JBUILDER build -j1 @runtest --display short --root . --debug-dependency-path 2>&1 | sed "s/ cmd / sh /" $ jbuilder build -j1 @runtest --display short --root . --debug-dependency-path 2>&1 | sed "s/ cmd / sh /"
sh alias runtest sh alias runtest
sh alias runtest sh alias runtest

6
test/blackbox-tests/test-cases/loop/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build --display short --root . -j 1 a $ jbuilder build --display short --root . -j 1 a
true x true x
true y true y
Dependency cycle between the following files: Dependency cycle between the following files:
@ -11,14 +11,14 @@ This second example is slightly more complicated as we request result1
but the cycle doesn't involve result1. We must make sure the output but the cycle doesn't involve result1. We must make sure the output
does show a cycle. does show a cycle.
$ $JBUILDER build --display short --root . -j 1 result1 $ jbuilder build --display short --root . -j 1 result1
Dependency cycle between the following files: Dependency cycle between the following files:
_build/default/result2 _build/default/result2
--> _build/default/input --> _build/default/input
--> _build/default/result2 --> _build/default/result2
[1] [1]
$ $JBUILDER build --display short --root . -j 1 result1 --debug-dependency-path $ jbuilder build --display short --root . -j 1 result1 --debug-dependency-path
Dependency cycle between the following files: Dependency cycle between the following files:
_build/default/result2 _build/default/result2
--> _build/default/input --> _build/default/input

2
test/blackbox-tests/test-cases/menhir/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 src/test.exe --display short --root . --debug-dependency-path $ jbuilder build -j1 src/test.exe --display short --root . --debug-dependency-path
ocamllex src/lexer1.ml ocamllex src/lexer1.ml
ocamldep src/lexer1.ml.d ocamldep src/lexer1.ml.d
ocamllex src/lexer2.ml ocamllex src/lexer2.ml

2
test/blackbox-tests/test-cases/merlin-tests/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build @print-merlins -j1 --display short --root . $ jbuilder build @print-merlins -j1 --display short --root .
ocamldep sanitize-dot-merlin/sanitize_dot_merlin.ml.d ocamldep sanitize-dot-merlin/sanitize_dot_merlin.ml.d
ocamlc sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmi,cmo,cmt} ocamlc sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmi,cmo,cmt}
ocamlopt sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmx,o} ocamlopt sanitize-dot-merlin/.sanitize_dot_merlin.eobjs/sanitize_dot_merlin.{cmx,o}

2
test/blackbox-tests/test-cases/meta-gen/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest --force -j1 --display short --root . $ jbuilder runtest --force -j1 --display short --root .
description = "contains \"quotes\"" description = "contains \"quotes\""
requires = "bytes" requires = "bytes"
archive(byte) = "foobar.cma" archive(byte) = "foobar.cma"

2
test/blackbox-tests/test-cases/misc/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
File "jbuild", line 65, characters 21-44: File "jbuild", line 65, characters 21-44:
Warning: Directory dir-that-doesnt-exist doesn't exist. Warning: Directory dir-that-doesnt-exist doesn't exist.
diff alias runtest diff alias runtest

2
test/blackbox-tests/test-cases/multiple-private-libs/run.t
View File

@ -1,6 +1,6 @@
This test checks that there is no clash when two private libraries have the same name This test checks that there is no clash when two private libraries have the same name
$ $JBUILDER build -j1 --display short --root . @doc-private $ jbuilder build -j1 --display short --root . @doc-private
ocamldep a/test.ml.d ocamldep a/test.ml.d
ocamlc a/.test.objs/test.{cmi,cmo,cmt} ocamlc a/.test.objs/test.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/test@a/test.odoc odoc _doc/_odoc/lib/test@a/test.odoc

2
test/blackbox-tests/test-cases/ocaml-syntax/run.t
View File

@ -1,2 +1,2 @@
$ $JBUILDER runtest --force -j1 --display short --root . $ jbuilder runtest --force -j1 --display short --root .
ocaml syntax ocaml syntax

4
test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER exec ./test.exe -j1 --debug-dep --display short --root . $ jbuilder exec ./test.exe -j1 --debug-dep --display short --root .
File "jbuild", line 1, characters 0-0: File "jbuild", line 1, characters 0-0:
Warning: Module "Lib" is used in several stanzas: Warning: Module "Lib" is used in several stanzas:
- jbuild:8 - jbuild:8
@ -13,7 +13,7 @@
- <internal location> - <internal location>
[1] [1]
$ $JBUILDER build src/a.cma -j1 --debug-dep --display short --root . $ jbuilder build src/a.cma -j1 --debug-dep --display short --root .
File "src/jbuild", line 1, characters 0-0: File "src/jbuild", line 1, characters 0-0:
Warning: Module "X" is used in several stanzas: Warning: Module "X" is used in several stanzas:
- src/jbuild:4 - src/jbuild:4

4
test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
View File

@ -1,5 +1,5 @@
Duplicate mld's in the same scope Duplicate mld's in the same scope
$ $JBUILDER build @doc -j1 --display short --root ./same-scope 2>&1 | grep -v Entering $ jbuilder build @doc -j1 --display short --root ./same-scope 2>&1 | grep -v Entering
odoc _doc/_html/odoc.css odoc _doc/_html/odoc.css
ocamlc lib1/.root_lib1.objs/root_lib1.{cmi,cmo,cmt} ocamlc lib1/.root_lib1.objs/root_lib1.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/root.lib1/root_lib1.odoc odoc _doc/_odoc/lib/root.lib1/root_lib1.odoc
@ -12,7 +12,7 @@ Duplicate mld's in the same scope
Duplicate mld's in different scope Duplicate mld's in different scope
$ rm -rf diff-scope/_build $ rm -rf diff-scope/_build
$ $JBUILDER build @doc -j1 --display short --root ./diff-scope 2>&1 | grep -v Entering $ jbuilder build @doc -j1 --display short --root ./diff-scope 2>&1 | grep -v Entering
odoc _doc/_html/odoc.css odoc _doc/_html/odoc.css
ocamlc scope1/.scope1.objs/scope1.{cmi,cmo,cmt} ocamlc scope1/.scope1.objs/scope1.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/scope1/scope1.odoc odoc _doc/_odoc/lib/scope1/scope1.odoc

8
test/blackbox-tests/test-cases/odoc/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build @doc -j1 --display short --root . $ jbuilder build @doc -j1 --display short --root .
ocamldep bar.ml.d ocamldep bar.ml.d
ocamlc .bar.objs/bar.{cmi,cmo,cmt} ocamlc .bar.objs/bar.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/bar/bar.odoc odoc _doc/_odoc/lib/bar/bar.odoc
@ -20,7 +20,7 @@
odoc _doc/_html/foo/index.html odoc _doc/_html/foo/index.html
odoc _doc/_html/foo/Foo_byte/.jbuilder-keep,_doc/_html/foo/Foo_byte/index.html odoc _doc/_html/foo/Foo_byte/.jbuilder-keep,_doc/_html/foo/Foo_byte/index.html
odoc _doc/_html/foo/Foo2/.jbuilder-keep,_doc/_html/foo/Foo2/index.html odoc _doc/_html/foo/Foo2/.jbuilder-keep,_doc/_html/foo/Foo2/index.html
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
@ -40,7 +40,7 @@
</body> </body>
</html> </html>
$ $JBUILDER build @foo-mld -j1 --display short --root . $ jbuilder build @foo-mld -j1 --display short --root .
{1 Library foo} {1 Library foo}
This library exposes the following toplevel modules: This library exposes the following toplevel modules:
{!modules:Foo Foo2} {!modules:Foo Foo2}
@ -48,7 +48,7 @@
This library exposes the following toplevel modules: This library exposes the following toplevel modules:
{!modules:Foo_byte} {!modules:Foo_byte}
$ $JBUILDER build @bar-mld -j1 --display short --root . $ jbuilder build @bar-mld -j1 --display short --root .
{1 Library bar} {1 Library bar}
This library exposes the following toplevel modules: This library exposes the following toplevel modules:
{!modules:Bar} {!modules:Bar}

4
test/blackbox-tests/test-cases/output-obj/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 --root . --display short @all $ jbuilder build -j1 --root . --display short @all
ocamldep test.ml.d ocamldep test.ml.d
ocamlc .test.eobjs/test.{cmi,cmo,cmt} ocamlc .test.eobjs/test.{cmi,cmo,cmt}
ocamlc test.bc.o ocamlc test.bc.o
@ -11,7 +11,7 @@
ocamlopt test.exe ocamlopt test.exe
ocamlopt test.so ocamlopt test.so
$ $JBUILDER build -j1 --root . --display quiet @runtest $ jbuilder build -j1 --root . --display quiet @runtest
static alias runtest static alias runtest
OK: ./static.bc OK: ./static.bc
dynamic alias runtest dynamic alias runtest

2
test/blackbox-tests/test-cases/package-dep/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
ocamldep bar.ml.d ocamldep bar.ml.d
ocamldep foo.ml.d ocamldep foo.ml.d
ocamlc .foo.objs/foo.{cmi,cmo,cmt} ocamlc .foo.objs/foo.{cmi,cmo,cmt}

6
test/blackbox-tests/test-cases/ppx-rewriter/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build ./w_omp_driver.exe -j1 --display short --root . $ jbuilder build ./w_omp_driver.exe -j1 --display short --root .
ocamldep ppx/fooppx.ml.d ocamldep ppx/fooppx.ml.d
ocamlc ppx/.fooppx.objs/fooppx.{cmi,cmo,cmt} ocamlc ppx/.fooppx.objs/fooppx.{cmi,cmo,cmt}
ocamlopt ppx/.fooppx.objs/fooppx.{cmx,o} ocamlopt ppx/.fooppx.objs/fooppx.{cmx,o}
@ -9,7 +9,7 @@
ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt} ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt}
ocamlopt .w_omp_driver.eobjs/w_omp_driver.{cmx,o} ocamlopt .w_omp_driver.eobjs/w_omp_driver.{cmx,o}
ocamlopt w_omp_driver.exe ocamlopt w_omp_driver.exe
$ $JBUILDER build ./w_ppx_driver.exe -j1 --display short --root . $ jbuilder build ./w_ppx_driver.exe -j1 --display short --root .
ocamlopt .ppx/ppx_driver.runner/ppx.exe ocamlopt .ppx/ppx_driver.runner/ppx.exe
ppx w_ppx_driver.pp.ml ppx w_ppx_driver.pp.ml
ocamldep w_ppx_driver.pp.ml.d ocamldep w_ppx_driver.pp.ml.d
@ -17,4 +17,4 @@
ocamlopt .w_ppx_driver.eobjs/w_ppx_driver.{cmx,o} ocamlopt .w_ppx_driver.eobjs/w_ppx_driver.{cmx,o}
ocamlopt w_ppx_driver.exe ocamlopt w_ppx_driver.exe
This test is broken because ppx_driver doesn't support migrate custom arguments This test is broken because ppx_driver doesn't support migrate custom arguments
# $ $JBUILDER build ./w_ppx_driver_flags.exe -j1 --display short --root . # $ jbuilder build ./w_ppx_driver_flags.exe -j1 --display short --root .

10
test/blackbox-tests/test-cases/private-public-overlap/run.t
View File

@ -1,13 +1,13 @@
public libraries may not have private dependencies public libraries may not have private dependencies
$ $JBUILDER build -j1 --display short --root private-dep 2>&1 | grep -v Entering $ jbuilder build -j1 --display short --root private-dep 2>&1 | grep -v Entering
File "jbuild", line 10, characters 14-24: File "jbuild", line 10, characters 14-24:
Error: Library "privatelib" is private, it cannot be a dependency of a public library. Error: Library "privatelib" is private, it cannot be a dependency of a public library.
You need to give "privatelib" a public name. You need to give "privatelib" a public name.
ocamldep publiclib.ml.d ocamldep publiclib.ml.d
On the other hand, public libraries may have private preprocessors On the other hand, public libraries may have private preprocessors
$ $JBUILDER build -j1 --display short --root private-rewriter 2>&1 | grep -v Entering $ jbuilder build -j1 --display short --root private-rewriter 2>&1 | grep -v Entering
ocamlc .ppx_internal.objs/ppx_internal.{cmi,cmo,cmt} ocamlc .ppx_internal.objs/ppx_internal.{cmi,cmo,cmt}
ocamlopt .ppx_internal.objs/ppx_internal.{cmx,o} ocamlopt .ppx_internal.objs/ppx_internal.{cmx,o}
ocamlopt ppx_internal.{a,cmxa} ocamlopt ppx_internal.{a,cmxa}
@ -21,7 +21,7 @@ On the other hand, public libraries may have private preprocessors
ocamlc mylib.cma ocamlc mylib.cma
Unless they introduce private runtime dependencies: Unless they introduce private runtime dependencies:
$ $JBUILDER build -j1 --display short --root private-runtime-deps 2>&1 | grep -v Entering $ jbuilder build -j1 --display short --root private-runtime-deps 2>&1 | grep -v Entering
File "jbuild", line 16, characters 20-31: File "jbuild", line 16, characters 20-31:
Error: Library "private_runtime_dep" is private, it cannot be a dependency of a public library. Error: Library "private_runtime_dep" is private, it cannot be a dependency of a public library.
You need to give "private_runtime_dep" a public name. You need to give "private_runtime_dep" a public name.
@ -33,12 +33,12 @@ Unless they introduce private runtime dependencies:
ocamldep mylib.pp.ml.d ocamldep mylib.pp.ml.d
However, public binaries may accept private dependencies However, public binaries may accept private dependencies
$ $JBUILDER build -j1 --display short --root exes 2>&1 | grep -v Entering $ jbuilder build -j1 --display short --root exes 2>&1 | grep -v Entering
ocamldep publicbin.ml.d ocamldep publicbin.ml.d
ocamlc .publicbin.eobjs/publicbin.{cmi,cmo,cmt} ocamlc .publicbin.eobjs/publicbin.{cmi,cmo,cmt}
ocamlopt .publicbin.eobjs/publicbin.{cmx,o} ocamlopt .publicbin.eobjs/publicbin.{cmx,o}
ocamlopt publicbin.exe ocamlopt publicbin.exe
Private dependencies shouldn't make the library optional Private dependencies shouldn't make the library optional
$ $JBUILDER build -j1 --display short --root optional 2>&1 | grep -v Entering $ jbuilder build -j1 --display short --root optional 2>&1 | grep -v Entering
[1] [1]

12
test/blackbox-tests/test-cases/promote/run.t
View File

@ -1,30 +1,30 @@
$ printf titi > x $ printf titi > x
$ $JBUILDER build --display short --root . -j1 --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/' $ jbuilder build --display short --root . -j1 --diff-command false @blah 2>&1 | sed 's/.*false.*/DIFF/'
sh (internal) (exit 1) sh (internal) (exit 1)
DIFF DIFF
$ cat x $ cat x
titi titi
$ $JBUILDER promote --display short --root . $ jbuilder promote --display short --root .
Promoting _build/default/x.gen to x. Promoting _build/default/x.gen to x.
$ cat x $ cat x
toto toto
$ $JBUILDER build --display short --root . -j1 --diff-command false @blah $ jbuilder build --display short --root . -j1 --diff-command false @blah
$ cat x $ cat x
toto toto
Otherwise this test fails on OSX Otherwise this test fails on OSX
$ $JBUILDER clean --display short --root . -j1 $ jbuilder clean --display short --root . -j1
$ printf titi > x $ printf titi > x
$ $JBUILDER build --display short --root . -j1 --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/' $ jbuilder build --display short --root . -j1 --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/'
sh (internal) (exit 1) sh (internal) (exit 1)
DIFF DIFF
Promoting _build/default/x.gen to x. Promoting _build/default/x.gen to x.
$ cat x $ cat x
toto toto
$ $JBUILDER build --display short --root . -j1 --diff-command false @blah $ jbuilder build --display short --root . -j1 --diff-command false @blah
$ cat x $ cat x
toto toto

2
test/blackbox-tests/test-cases/reason/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build @runtest @install-file -j1 --display short --root . $ jbuilder build @runtest @install-file -j1 --display short --root .
refmt bar.re.ml refmt bar.re.ml
ocamldep pp/reasononlypp.depends.ocamldep-output ocamldep pp/reasononlypp.depends.ocamldep-output
ocamldep ppx/reasonppx.depends.ocamldep-output ocamldep ppx/reasonppx.depends.ocamldep-output

2
test/blackbox-tests/test-cases/redirections/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest -j1 --display short --root . 2>&1 | sed "s/ cmd / sh /" $ jbuilder runtest -j1 --display short --root . 2>&1 | sed "s/ cmd / sh /"
sh stderr,stdout sh stderr,stdout
sh stderr,stdout sh stderr,stdout
diff alias runtest diff alias runtest

2
test/blackbox-tests/test-cases/scope-bug/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 --display short --root . @install $ jbuilder build -j1 --display short --root . @install
ocamldep alib/alib.ml.d ocamldep alib/alib.ml.d
ocamldep alib/main.ml.d ocamldep alib/main.ml.d
ocamlc alib/.alib.objs/alib__.{cmi,cmo,cmt} ocamlc alib/.alib.objs/alib__.{cmi,cmo,cmt}

2
test/blackbox-tests/test-cases/scope-ppx-bug/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER build -j1 --display short --root . @install --debug-dep $ jbuilder build -j1 --display short --root . @install --debug-dep
ocamlc a/ppx/.a.objs/a.{cmi,cmo,cmt} ocamlc a/ppx/.a.objs/a.{cmi,cmo,cmt}
ocamlopt a/ppx/.a.objs/a.{cmx,o} ocamlopt a/ppx/.a.objs/a.{cmx,o}
ocamlopt a/ppx/a.{a,cmxa} ocamlopt a/ppx/a.{a,cmxa}

2
test/blackbox-tests/test-cases/select/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER runtest -j1 --display short --root . $ jbuilder runtest -j1 --display short --root .
ocamldep bar.ml.d ocamldep bar.ml.d
ocamldep bar_no_unix.ml.d ocamldep bar_no_unix.ml.d
ocamldep bar_unix.ml.d ocamldep bar_unix.ml.d

2
test/blackbox-tests/test-cases/utop/run.t
View File

@ -1,4 +1,4 @@
$ $JBUILDER utop -j1 --display short --root . forutop -- init_forutop.ml $ jbuilder utop -j1 --display short --root . forutop -- init_forutop.ml
ocamldep forutop/.utop/utop.ml.d ocamldep forutop/.utop/utop.ml.d
ocamldep forutop/forutop.ml.d ocamldep forutop/forutop.ml.d
ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt} ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}