1
1
open Import
2
2
open Memo.O
3
3
4
- let alias mode ~dir =
4
+ let runtest_alias mode ~dir =
5
5
match mode with
6
6
| `js mode -> Jsoo_rules. js_of_ocaml_runtest_alias ~dir ~mode
7
7
| `exe | `bc -> Memo. return Alias0. runtest
@@ -68,7 +68,7 @@ let rules (t : Tests.t) ~sctx ~dir ~scope ~expander ~dir_contents =
68
68
| false ->
69
69
let loc = Nonempty_list. hd t.exes.names |> fst in
70
70
Memo. parallel_iter runtest_modes ~f: (fun mode ->
71
- let * alias_name = alias mode ~dir in
71
+ let * alias_name = runtest_alias mode ~dir in
72
72
let alias = Alias. make alias_name ~dir in
73
73
Simple_rules.Alias_rules. add_empty sctx ~loc ~alias )
74
74
| true ->
@@ -97,7 +97,7 @@ let rules (t : Tests.t) ~sctx ~dir ~scope ~expander ~dir_contents =
97
97
in
98
98
Pform.Map. singleton test_pform [ Value. Path test_exe_path ]
99
99
in
100
- let * runtest_alias = alias runtest_mode ~dir in
100
+ let * runtest_alias = runtest_alias runtest_mode ~dir in
101
101
let deps =
102
102
(* is this useless? we are going to infer the dependency anyway *)
103
103
match custom_runner with
@@ -114,9 +114,10 @@ let rules (t : Tests.t) ~sctx ~dir ~scope ~expander ~dir_contents =
114
114
| `js JS | `exe | `bc -> t.deps)
115
115
in
116
116
let add_alias ~loc ~action =
117
+ let alias = Alias. make ~dir (Alias.Name. of_string s) in
117
118
(* CR rgrinberg: why are we going through the stanza api? *)
118
- let alias =
119
- { Alias_conf. name = runtest_alias
119
+ let alias_conf =
120
+ { Alias_conf. name = Alias. name alias
120
121
; locks = t.locks
121
122
; package = t.package
122
123
; deps
@@ -125,7 +126,10 @@ let rules (t : Tests.t) ~sctx ~dir ~scope ~expander ~dir_contents =
125
126
; loc
126
127
}
127
128
in
128
- Simple_rules. alias sctx ~extra_bindings ~dir ~expander alias
129
+ Rules.Produce.Alias. add_deps
130
+ (Alias. make ~dir runtest_alias)
131
+ (Action_builder. dep (Dep. alias alias))
132
+ >>> Simple_rules. alias sctx ~extra_bindings ~dir ~expander alias_conf
129
133
in
130
134
match test_kind dir_contents (loc, s, ext) with
131
135
| `Regular -> add_alias ~loc ~action: run_action
0 commit comments