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

Change cram.mll to not use anon args

This commit is contained in:
Rudi Grinberg 2018-04-18 19:29:07 +07:00
parent e467cafed0
commit f8f1a4036e
2 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/jbuild
View File

@ -6,7 +6,7 @@
(action (action
(chdir sample-projects/hello_world (chdir sample-projects/hello_world
(setenv JBUILDER ${bin:jbuilder} (setenv JBUILDER ${bin:jbuilder}
(run ${exe:../test/blackbox-tests/cram.exe} run.t)))))) (run ${exe:../test/blackbox-tests/cram.exe} -test run.t))))))
(alias (alias
((name runtest) ((name runtest)
@ -14,6 +14,6 @@
(action (action
(chdir sample-projects/with-configure-step (chdir sample-projects/with-configure-step
(setenv JBUILDER ${bin:jbuilder} (setenv JBUILDER ${bin:jbuilder}
(run ${exe:../test/blackbox-tests/cram.exe} run.t)))))) (run ${exe:../test/blackbox-tests/cram.exe} -test run.t))))))

102
test/blackbox-tests/jbuild
View File

@ -13,7 +13,7 @@
(action (action
(chdir test-cases/redirections (chdir test-cases/redirections
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -23,7 +23,7 @@
(action (action
(chdir test-cases/misc (chdir test-cases/misc
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -33,7 +33,7 @@
(action (action
(chdir test-cases/github20 (chdir test-cases/github20
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -44,7 +44,7 @@
(chdir test-cases/js_of_ocaml (chdir test-cases/js_of_ocaml
(setenv NODE ${bin:node} (setenv NODE ${bin:node}
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected))))))) (diff? run.t run.t.corrected)))))))
(alias (alias
@ -54,7 +54,7 @@
(action (action
(chdir test-cases/github24 (chdir test-cases/github24
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -64,7 +64,7 @@
(action (action
(chdir test-cases/menhir (chdir test-cases/menhir
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -75,7 +75,7 @@
(chdir test-cases/github25/root (chdir test-cases/github25/root
(setenv OCAMLPATH ../findlib-packages (setenv OCAMLPATH ../findlib-packages
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected))))))) (diff? run.t run.t.corrected)))))))
(alias (alias
@ -85,7 +85,7 @@
(action (action
(chdir test-cases/lib-available (chdir test-cases/lib-available
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -95,7 +95,7 @@
(action (action
(chdir test-cases/copy_files (chdir test-cases/copy_files
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -105,7 +105,7 @@
(action (action
(chdir test-cases/aliases (chdir test-cases/aliases
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -115,7 +115,7 @@
(action (action
(chdir test-cases/force-test (chdir test-cases/force-test
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -125,7 +125,7 @@
(action (action
(chdir test-cases/meta-gen (chdir test-cases/meta-gen
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -135,7 +135,7 @@
(action (action
(chdir test-cases/exec-cmd (chdir test-cases/exec-cmd
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -145,7 +145,7 @@
(action (action
(chdir test-cases/ocaml-syntax (chdir test-cases/ocaml-syntax
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -155,7 +155,7 @@
(action (action
(chdir test-cases/gen-opam-install-file (chdir test-cases/gen-opam-install-file
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -165,7 +165,7 @@
(action (action
(chdir test-cases/reason (chdir test-cases/reason
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -175,7 +175,8 @@
(action (action
(chdir test-cases/odoc (chdir test-cases/odoc
(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
-test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -185,7 +186,7 @@
(action (action
(chdir test-cases/select (chdir test-cases/select
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -195,7 +196,8 @@
(action (action
(chdir test-cases/multiple-private-libs (chdir test-cases/multiple-private-libs
(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
-test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -205,7 +207,8 @@
(action (action
(chdir test-cases/ppx-rewriter (chdir test-cases/ppx-rewriter
(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
-test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -215,7 +218,7 @@
(action (action
(chdir test-cases/utop (chdir test-cases/utop
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -225,7 +228,7 @@
(action (action
(chdir test-cases/c-stubs (chdir test-cases/c-stubs
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -235,7 +238,7 @@
(action (action
(chdir test-cases/cross-compilation (chdir test-cases/cross-compilation
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -245,7 +248,7 @@
(action (action
(chdir test-cases/promote (chdir test-cases/promote
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -255,7 +258,7 @@
(action (action
(chdir test-cases/include-loop (chdir test-cases/include-loop
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -265,7 +268,7 @@
(action (action
(chdir test-cases/scope-bug (chdir test-cases/scope-bug
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -275,7 +278,7 @@
(action (action
(chdir test-cases/scope-ppx-bug (chdir test-cases/scope-ppx-bug
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -285,7 +288,7 @@
(action (action
(chdir test-cases/loop (chdir test-cases/loop
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -295,7 +298,7 @@
(action (action
(chdir test-cases/intf-only (chdir test-cases/intf-only
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -305,7 +308,7 @@
(action (action
(chdir test-cases/installable-dup-private-libs (chdir test-cases/installable-dup-private-libs
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -315,7 +318,7 @@
(action (action
(chdir test-cases/inline_tests (chdir test-cases/inline_tests
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -325,7 +328,7 @@
(action (action
(chdir test-cases/byte-code-only (chdir test-cases/byte-code-only
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -335,7 +338,7 @@
(action (action
(chdir test-cases/merlin-tests (chdir test-cases/merlin-tests
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -346,7 +349,7 @@
(chdir test-cases/findlib (chdir test-cases/findlib
(setenv OCAMLPATH findlib-packages (setenv OCAMLPATH findlib-packages
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected))))))) (diff? run.t run.t.corrected)))))))
(alias (alias
@ -356,7 +359,8 @@
(action (action
(chdir test-cases/odoc-unique-mlds (chdir test-cases/odoc-unique-mlds
(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
-test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -366,7 +370,7 @@
(action (action
(chdir test-cases/ocamldep-multi-stanzas (chdir test-cases/ocamldep-multi-stanzas
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -376,7 +380,7 @@
(action (action
(chdir test-cases/exclude-missing-module (chdir test-cases/exclude-missing-module
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -386,7 +390,7 @@
(action (action
(chdir test-cases/github534 (chdir test-cases/github534
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -396,7 +400,7 @@
(action (action
(chdir test-cases/github568 (chdir test-cases/github568
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -407,7 +411,7 @@
(chdir test-cases/output-obj (chdir test-cases/output-obj
(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) -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -417,7 +421,7 @@
(action (action
(chdir test-cases/github597 (chdir test-cases/github597
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -427,7 +431,7 @@
(action (action
(chdir test-cases/private-public-overlap (chdir test-cases/private-public-overlap
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -437,7 +441,7 @@
(action (action
(chdir test-cases/depend-on-the-universe (chdir test-cases/depend-on-the-universe
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -447,7 +451,7 @@
(action (action
(chdir test-cases/package-dep (chdir test-cases/package-dep
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -457,7 +461,7 @@
(action (action
(chdir test-cases/github644 (chdir test-cases/github644
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -467,7 +471,7 @@
(action (action
(chdir test-cases/configurator (chdir test-cases/configurator
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -477,7 +481,7 @@
(action (action
(chdir test-cases/quoting (chdir test-cases/quoting
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -487,7 +491,7 @@
(action (action
(chdir test-cases/null-dep (chdir test-cases/null-dep
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))
(alias (alias
@ -497,5 +501,5 @@
(action (action
(chdir test-cases/github660 (chdir test-cases/github660
(progn (progn
(run ${exe:cram.exe} run.t) (run ${exe:cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))) (diff? run.t run.t.corrected))))))