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

Merge pull request #709 from rgrinberg/cram-portable-exts 

Cram portable exts
This commit is contained in:
Rudi Grinberg 2018-04-18 22:51:55 +07:00 committed by GitHub
parent e467cafed0 ab50461741
commit d9a90b4f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 144 additions and 102 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))))))

120
test/blackbox-tests/cram.mll
View File

@ -12,13 +12,49 @@ type item =
let eol = '\n' | eof let eol = '\n' | eof
let ext = '.' ['a'-'z' 'A'-'Z' '0'-'9']+
rule file = parse rule file = parse
| eof { [] } | eof { [] }
| " $ " ([^'\n']* as str) eol { Command str :: file lexbuf } | " $ " ([^'\n']* as str) eol { Command str :: file lexbuf }
| " " ([^'\n']* as str) eol { Output str :: file lexbuf } | " " ([^'\n']* as str) eol { Output str :: file lexbuf }
| ([^'\n']* as str) eol { Comment str :: file lexbuf } | ([^'\n']* as str) eol { Comment str :: file lexbuf }
and postprocess tbl b = parse
| eof { Buffer.contents b }
| ([^ '/'] as c) (ext as e)
{ Buffer.add_char b c;
begin match List.assoc e tbl with
| res -> Buffer.add_string b res
| exception Not_found -> Buffer.add_string b e
end;
postprocess tbl b lexbuf
}
| _ as c { Buffer.add_char b c; postprocess tbl b lexbuf }
{ {
module Configurator = Configurator.V1
let make_ext_replace config =
let tbl =
let var = Configurator.ocaml_config_var_exn config in
let exts =
[ var "ext_dll", "$ext_dll"
; var "ext_asm", "$ext_asm"
; var "ext_lib", "$ext_lib"
; var "ext_obj", "$ext_obj"
] in
(* need to special case exe since we can only remove this extension in
general *)
match var "ext_exe" with
| "" -> exts
| ext -> (ext, "") :: exts
in
List.iter tbl ~f:(fun (e, _) -> assert (e <> ""));
fun s ->
let l = Lexing.from_string s in
postprocess tbl (Buffer.create (String.length s)) l
type version = int * int * int type version = int * int * int
let parse_version s = let parse_version s =
@ -58,51 +94,53 @@ rule file = parse
let ocaml_version = ref None in let ocaml_version = ref None in
let skip_versions = ref [] in let skip_versions = ref [] in
let expect_test = ref None in let expect_test = ref None in
let usage = sprintf "%s [OPTIONS]" (Filename.basename Sys.executable_name) in let args =
let anon s =
match !expect_test with
| None -> expect_test := Some s
| Some _ -> raise (Arg.Bad "test must only be given once") in
Arg.parse
[ "-ocamlv" [ "-ocamlv"
, Arg.String (fun s -> ocaml_version := Some (parse_version s)) , Arg.String (fun s -> ocaml_version := Some (parse_version s))
, "Version of ocaml being used" , "Version of ocaml being used"
; "-skip-versions" ; "-skip-versions"
, Arg.String (fun s -> skip_versions := parse_skip_versions s) , Arg.String (fun s -> skip_versions := parse_skip_versions s)
, "Comma separated versions of ocaml where to skip test" , "Comma separated versions of ocaml where to skip test"
] anon usage; ; "-test"
let expect_test = , Arg.String (fun s -> expect_test := Some s)
match !expect_test with , "expect test file"
| None -> raise (Arg.Bad "expect test file must be passed") ] in
| Some p -> p in Configurator.main ~args ~name:"cram" (fun configurator ->
begin match !ocaml_version, !skip_versions with let expect_test =
| None, [] -> () match !expect_test with
| None, _::_ -> raise (Arg.Bad "provide -ocaml along with -skip-versions") | None -> raise (Arg.Bad "expect test file must be passed")
| Some v, skip -> | Some p -> p in
if List.exists skip ~f:(fun (op, v') -> test op v v') then exit 0 begin match !ocaml_version, !skip_versions with
end; | None, [] -> ()
Test_common.run_expect_test expect_test ~f:(fun file_contents lexbuf -> | None, _::_ -> raise (Arg.Bad "provide -ocaml along with -skip-versions")
let items = file lexbuf in | Some v, skip ->
let temp_file = Filename.temp_file "jbuilder-test" ".output" in if List.exists skip ~f:(fun (op, v') -> test op v v') then exit 0
at_exit (fun () -> Sys.remove temp_file); end;
let buf = Buffer.create (String.length file_contents + 1024) in Test_common.run_expect_test expect_test ~f:(fun file_contents lexbuf ->
List.iter items ~f:(function let items = file lexbuf in
| Output _ -> () let temp_file = Filename.temp_file "jbuilder-test" ".output" in
| Comment s -> Buffer.add_string buf s; Buffer.add_char buf '\n' at_exit (fun () -> Sys.remove temp_file);
| Command s -> let buf = Buffer.create (String.length file_contents + 1024) in
Printf.bprintf buf " $ %s\n" s; List.iter items ~f:(function
let fd = Unix.openfile temp_file [O_WRONLY; O_TRUNC] 0 in | Output _ -> ()
let pid = | Comment s -> Buffer.add_string buf s; Buffer.add_char buf '\n'
Unix.create_process "sh" [|"sh"; "-c"; s|] Unix.stdin fd fd | Command s ->
in Printf.bprintf buf " $ %s\n" s;
Unix.close fd; let fd = Unix.openfile temp_file [O_WRONLY; O_TRUNC] 0 in
let n = let pid =
match snd (Unix.waitpid [] pid) with Unix.create_process "sh" [|"sh"; "-c"; s|] Unix.stdin fd fd
| WEXITED n -> n in
| _ -> 255 Unix.close fd;
in let n =
List.iter (Io.lines_of_file temp_file) ~f:(fun line -> match snd (Unix.waitpid [] pid) with
Printf.bprintf buf " %s\n" (Ansi_color.strip line)); | WEXITED n -> n
if n <> 0 then Printf.bprintf buf " [%d]\n" n); | _ -> 255
Buffer.contents buf) in
let ext_replace = make_ext_replace configurator in
List.iter (Io.lines_of_file temp_file) ~f:(fun line ->
Printf.bprintf buf " %s\n"
(ext_replace (Ansi_color.strip line)));
if n <> 0 then Printf.bprintf buf " [%d]\n" n);
Buffer.contents buf)
)
} }

104
test/blackbox-tests/jbuild
View File

@ -2,7 +2,7 @@
(executable (executable
((name cram) ((name cram)
(libraries (test_common jbuilder)))) (libraries (test_common jbuilder configurator))))
(ocamllex (cram)) (ocamllex (cram))
@ -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))))))

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

@ -1,7 +1,7 @@
$ jbuilder exec ./qnativerun/run.exe --display short $ jbuilder exec ./qnativerun/run.exe --display short
ocamldep qnativerun/run.ml.d ocamldep qnativerun/run.ml.d
ocamlc q/q_stub.o ocamlc q/q_stub$ext_obj
ocamlmklib q/dllq_stubs.so,q/libq_stubs.a ocamlmklib q/dllq_stubs$ext_dll,q/libq_stubs$ext_lib
ocamldep q/q.ml.d ocamldep q/q.ml.d
ocamldep q/q.mli.d ocamldep q/q.mli.d
ocamlc q/.q.objs/q.{cmi,cmti} ocamlc q/.q.objs/q.{cmi,cmti}

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

@ -6,8 +6,8 @@
ocamlc .foo.objs/dummy.{cmi,cmo,cmt} ocamlc .foo.objs/dummy.{cmi,cmo,cmt}
ocamlopt .foo.objs/dummy.{cmx,o} ocamlopt .foo.objs/dummy.{cmx,o}
ocamlopt foo.{a,cmxa} ocamlopt foo.{a,cmxa}
ocamlc bar.o ocamlc bar$ext_obj
ocamlmklib dllfoo_stubs.so,libfoo_stubs.a ocamlmklib dllfoo_stubs$ext_dll,libfoo_stubs$ext_lib
ocamlc .test.eobjs/lexer1.{cmi,cmo,cmt} ocamlc .test.eobjs/lexer1.{cmi,cmo,cmt}
ocamlopt .test.eobjs/lexer1.{cmx,o} ocamlopt .test.eobjs/lexer1.{cmx,o}
ocamlc .test.eobjs/test.{cmi,cmo,cmt} ocamlc .test.eobjs/test.{cmi,cmo,cmt}

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

@ -33,7 +33,7 @@
"_build/install/default.foo/lib/p/p.ml" {"../../foo-sysroot/lib/p/p.ml"} "_build/install/default.foo/lib/p/p.ml" {"../../foo-sysroot/lib/p/p.ml"}
"_build/install/default.foo/lib/p/p.cma" {"../../foo-sysroot/lib/p/p.cma"} "_build/install/default.foo/lib/p/p.cma" {"../../foo-sysroot/lib/p/p.cma"}
"_build/install/default.foo/lib/p/p.cmxa" {"../../foo-sysroot/lib/p/p.cmxa"} "_build/install/default.foo/lib/p/p.cmxa" {"../../foo-sysroot/lib/p/p.cmxa"}
"_build/install/default.foo/lib/p/p.a" {"../../foo-sysroot/lib/p/p.a"} "_build/install/default.foo/lib/p/p$ext_lib" {"../../foo-sysroot/lib/p/p$ext_lib"}
"_build/install/default.foo/lib/p/p.cmxs" {"../../foo-sysroot/lib/p/p.cmxs"} "_build/install/default.foo/lib/p/p.cmxs" {"../../foo-sysroot/lib/p/p.cmxs"}
"_build/install/default.foo/lib/p/p.dune" {"../../foo-sysroot/lib/p/p.dune"} "_build/install/default.foo/lib/p/p.dune" {"../../foo-sysroot/lib/p/p.dune"}
] ]

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

@ -25,7 +25,7 @@
"_build/install/default/lib/foo/foo.ml" {"foo.ml"} "_build/install/default/lib/foo/foo.ml" {"foo.ml"}
"_build/install/default/lib/foo/foo.cma" {"foo.cma"} "_build/install/default/lib/foo/foo.cma" {"foo.cma"}
"_build/install/default/lib/foo/foo.cmxa" {"foo.cmxa"} "_build/install/default/lib/foo/foo.cmxa" {"foo.cmxa"}
"_build/install/default/lib/foo/foo.a" {"foo.a"} "_build/install/default/lib/foo/foo$ext_lib" {"foo$ext_lib"}
"_build/install/default/lib/foo/foo.cmxs" {"foo.cmxs"} "_build/install/default/lib/foo/foo.cmxs" {"foo.cmxs"}
"_build/install/default/lib/foo/foo.js" {"foo.js"} "_build/install/default/lib/foo/foo.js" {"foo.js"}
"_build/install/default/lib/foo/cfoo.h" {"cfoo.h"} "_build/install/default/lib/foo/cfoo.h" {"cfoo.h"}

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

@ -1,6 +1,6 @@
$ jbuilder build --display short --dev bin/technologic.bc.js @install lib/x.cma.js lib/x__Y.cmo.js bin/z.cmo.js $ jbuilder build --display short --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$ext_obj
ocamlmklib lib/dllx_stubs.so,lib/libx_stubs.a ocamlmklib lib/dllx_stubs$ext_dll,lib/libx_stubs$ext_lib
ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe ocamlopt .ppx/js_of_ocaml-ppx/ppx.exe
ppx lib/x.pp.ml ppx lib/x.pp.ml
ocamldep lib/x.pp.ml.d ocamldep lib/x.pp.ml.d

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

@ -8,7 +8,7 @@
each module cannot appear in more than one "modules" field - it must belong each module cannot appear in more than one "modules" field - it must belong
to a single library or executable. to a single library or executable.
This warning will become an error in the future. This warning will become an error in the future.
Multiple rules generated for _build/default/lib.o: Multiple rules generated for _build/default/lib$ext_obj:
- <internal location> - <internal location>
- <internal location> - <internal location>
[1] [1]