Skip to content

Fix marshalling test (compression issue was fixed in 5.1.1) #1620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix marshalling test (compression issue was fixed in 5.1.1) #1620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions compiler/tests-jsoo/test_marshal.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,19 @@ let%expect_test _ =
"\132\149\166\189\r\022\206\021\001\147F\137d(\181/\253\000Xm\000\0000\n\
\000\000'\016c\001\000\012\135\007E"
in
let ocaml_5_1 =
let ocaml_5_1_0 =
match String.split_on_char '.' Sys.ocaml_version with
| major :: minor :: _ ->
let major = int_of_string major and minor = int_of_string minor in
major > 5 || (major = 5 && minor >= 1)
| major :: minor1 :: minor2 :: _ ->
let major = int_of_string major
and minor1 = int_of_string minor1
and minor2 = int_of_string minor2 in
major > 5 || (major = 5 && minor1 = 1 && minor2 = 0)
| _ -> assert false
in
let s =
(* This would only work on OCaml 5.1.0 if we were not linking
against compiler-libs *)
if ocaml_5_1 && not (Sys.win32 || Sys.cygwin)
if ocaml_5_1_0 && not (Sys.win32 || Sys.cygwin)
then Marshal.from_string data 0
else String.make 10000 'c'
in
Expand Down