Skip to content

Commit f84cda3

Browse files
committed
Updated tests, removed duplicate finalize call.
Signed-off-by: Pavel Senchanka <pavel.senchanka@gmail.com>
1 parent 88a1373 commit f84cda3

2 files changed

Lines changed: 16 additions & 20 deletions

File tree

src/build_system.ml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,25 +1226,21 @@ let create ~contexts ~file_tree ~hook =
12261226
List.map contexts ~f:(fun c -> (c.Context.name, c))
12271227
|> String.Map.of_list_exn
12281228
in
1229-
let t =
1230-
{ contexts
1231-
; files = Path.Table.create 1024
1232-
; packages = Path.Table.create 1024
1233-
; trace = Trace.load ()
1234-
; local_mkdirs = Path.Set.empty
1235-
; dirs = Path.Table.create 1024
1236-
; load_dir_stack = []
1237-
; file_tree
1238-
; gen_rules = String.Map.map contexts ~f:(fun _ ~dir:_ ->
1239-
die "gen_rules called too early")
1240-
; build_dirs_to_keep = Path.Set.empty
1241-
; files_of = Path.Table.create 1024
1242-
; prefix = None
1243-
; hook
1244-
}
1245-
in
1246-
at_exit (fun () -> finalize t);
1247-
t
1229+
{ contexts
1230+
; files = Path.Table.create 1024
1231+
; packages = Path.Table.create 1024
1232+
; trace = Trace.load ()
1233+
; local_mkdirs = Path.Set.empty
1234+
; dirs = Path.Table.create 1024
1235+
; load_dir_stack = []
1236+
; file_tree
1237+
; gen_rules = String.Map.map contexts ~f:(fun _ ~dir:_ ->
1238+
die "gen_rules called too early")
1239+
; build_dirs_to_keep = Path.Set.empty
1240+
; files_of = Path.Table.create 1024
1241+
; prefix = None
1242+
; hook
1243+
}
12481244

12491245
let eval_request t ~request ~process_target =
12501246
let { Build_interpret.Static_deps.

test/blackbox-tests/test-cases/promote/run.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Otherwise this test fails on OSX
2020

2121
$ printf titi > x
2222
$ dune build --display short --diff-command false @blah --auto-promote 2>&1 | sed 's/.*false.*/DIFF/'
23+
Promoting _build/default/x.gen to x.
2324
sh (internal) (exit 1)
2425
DIFF
25-
Promoting _build/default/x.gen to x.
2626
$ cat x
2727
toto
2828
$ dune build --display short --diff-command false @blah

0 commit comments

Comments
 (0)