Skip to content

Commit a555ed4

Browse files
committed
Tests: fix tests-full
1 parent 865249e commit a555ed4

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

compiler/tests-full/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(rule
22
(targets stdlib.cma.js)
33
(enabled_if
4-
(= %{ocaml_version} "5.2.0"))
4+
(and (>= %{ocaml_version} "5.2") (< %{ocaml_version} "5.3")))
55
(action
66
(run
77
%{bin:js_of_ocaml}
@@ -14,7 +14,7 @@
1414
(rule
1515
(targets stdlib.cma.output.js)
1616
(enabled_if
17-
(= %{ocaml_version} "5.2.0"))
17+
(and (>= %{ocaml_version} "5.2") (< %{ocaml_version} "5.3")))
1818
(action
1919
(with-stdout-to
2020
%{targets}
@@ -23,7 +23,7 @@
2323
(rule
2424
(alias runtest)
2525
(enabled_if
26-
(= %{ocaml_version} "5.2.0"))
26+
(and (>= %{ocaml_version} "5.2") (< %{ocaml_version} "5.3")))
2727
(action
2828
(diff stdlib.cma.expected.js stdlib.cma.output.js)))
2929

compiler/tests-full/stdlib.cma.expected.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,8 @@
11211121
caml_maybe_attach_backtrace = runtime.caml_maybe_attach_backtrace,
11221122
caml_wrap_exception = runtime.caml_wrap_exception,
11231123
global_data = runtime.caml_get_global_data(),
1124-
ocaml_version = "5.2.0",
1125-
ocaml_release = [0, 5, 2, 0, 0],
1124+
ocaml_version = "5.2.1",
1125+
ocaml_release = [0, 5, 2, 1, 0],
11261126
Stdlib = global_data.Stdlib,
11271127
executable_name =
11281128
/*<<sys.ml.in:36:22>>*/ runtime.caml_sys_executable_name(0),
@@ -23571,26 +23571,26 @@
2357123571
/*<<gc.ml:115:21>>*/ return caml_call2(Stdlib_Atomic[4], a, 0) /*<<gc.ml:115:39>>*/ ;
2357223572
}
2357323573
function create_alarm(f){
23574-
var _y_ = /*<<gc.ml:118:24>>*/ caml_call1(Stdlib_Atomic[1], 1);
23575-
/*<<gc.ml:119:2>>*/ caml_call1
23574+
var alarm = /*<<gc.ml:119:14>>*/ caml_call1(Stdlib_Atomic[1], 1);
23575+
/*<<gc.ml:120:2>>*/ caml_call1
2357623576
(Stdlib_Domain[6],
2357723577
function(param){
23578-
/*<<gc.ml:119:28>>*/ return delete_alarm(_y_) /*<<gc.ml:119:52>>*/ ;
23578+
/*<<gc.ml:120:28>>*/ return delete_alarm(alarm) /*<<gc.ml:120:46>>*/ ;
2357923579
});
23580-
/*<<gc.ml:120:26>>*/ return _y_;
23581-
/*<<gc.ml:121:13>>*/ }
23580+
/*<<gc.ml:122:26>>*/ return alarm;
23581+
/*<<gc.ml:123:7>>*/ }
2358223582
var
2358323583
null_tracker =
2358423584
/*<<?>>*/ [0,
23585-
function(param){ /*<<gc.ml:143:30>>*/ return 0; /*<<gc.ml:143:34>>*/ },
23586-
function(param){ /*<<gc.ml:144:30>>*/ return 0; /*<<gc.ml:144:34>>*/ },
23587-
function(param){ /*<<gc.ml:145:26>>*/ return 0; /*<<gc.ml:145:30>>*/ },
23588-
function(param){ /*<<gc.ml:146:32>>*/ return 0; /*<<gc.ml:146:34>>*/ },
23589-
function(param){ /*<<gc.ml:147:32>>*/ return 0; /*<<gc.ml:147:34>>*/ }];
23585+
function(param){ /*<<gc.ml:145:30>>*/ return 0; /*<<gc.ml:145:34>>*/ },
23586+
function(param){ /*<<gc.ml:146:30>>*/ return 0; /*<<gc.ml:146:34>>*/ },
23587+
function(param){ /*<<gc.ml:147:26>>*/ return 0; /*<<gc.ml:147:30>>*/ },
23588+
function(param){ /*<<gc.ml:148:32>>*/ return 0; /*<<gc.ml:148:34>>*/ },
23589+
function(param){ /*<<gc.ml:149:32>>*/ return 0; /*<<gc.ml:149:34>>*/ }];
2359023590
function start(sampling_rate, opt, tracker){
23591-
var callstack_size = /*<<gc.ml:155:6>>*/ opt ? opt[1] : Stdlib[19];
23592-
/*<<gc.ml:158:6>>*/ return runtime.caml_memprof_start
23593-
(sampling_rate, callstack_size, tracker) /*<<gc.ml:158:50>>*/ ;
23591+
var callstack_size = /*<<gc.ml:157:6>>*/ opt ? opt[1] : Stdlib[19];
23592+
/*<<gc.ml:160:6>>*/ return runtime.caml_memprof_start
23593+
(sampling_rate, callstack_size, tracker) /*<<gc.ml:160:50>>*/ ;
2359423594
}
2359523595
var
2359623596
Stdlib_Gc =

dune

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@
4646
%{dep:VERSION}
4747
%{dep:tools/version/GIT-VERSION}))))
4848

49-
(data_only_dirs _wikidoc doc-dev)
49+
(data_only_dirs _wikidoc doc-dev jane-street)
50+
(vendored_dirs )

0 commit comments

Comments
 (0)