Merge pull request #403 from hhugo/fix-for-new-jsoo

dinosaure · web-flow · commit c62a108eb71e · 2024-06-04T17:52:17.000+02:00
Adapt jsoo runtime to new jsoo version
diff --git a/alcotest.opam b/alcotest.opam
@@ -32,6 +32,7 @@ depends: [
 ]
 conflicts: [
   "result" {< "1.5"}
+  "js_of_ocaml-compiler" {< "5.8"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/dune-project b/dune-project
@@ -34,6 +34,7 @@ tests to run.
   ocaml-syntax-shims)
  (conflicts
   (result (< 1.5)) ;; Ensure `Result.result` = `Stdlib.result` when possible
+  (js_of_ocaml-compiler (< 5.8)) ;; requirement for the js stubs
   ))
 
 (package
diff --git a/src/alcotest/runtime.js b/src/alcotest/runtime.js
@@ -1,26 +1,23 @@
 //Provides: alcotest_saved_stdout
-var alcotest_saved_stdout 
+var alcotest_saved_stdout
 //Provides: alcotest_saved_stderr
 var alcotest_saved_stderr
 
 //Provides: alcotest_before_test
-//Requires: caml_global_data, caml_ml_channels
+//Requires: caml_ml_channel_redirect
 //Requires: alcotest_saved_stderr, alcotest_saved_stdout
 function alcotest_before_test (voutput, vstdout, vstderr){
-  alcotest_saved_stderr = caml_ml_channels[vstderr];
-  alcotest_saved_stdout = caml_ml_channels[vstdout];
-  var output = caml_ml_channels[voutput];
-  caml_ml_channels[vstdout] = output;
-  caml_ml_channels[vstderr] = output;
+  alcotest_saved_stderr = caml_ml_channel_redirect(vstderr,voutput);
+  alcotest_saved_stdout = caml_ml_channel_redirect(vstdout,voutput);
   return 0;
 }
 
 //Provides: alcotest_after_test
-//Requires: caml_global_data, caml_ml_channels
+//Requires: caml_ml_channel_restore
 //Requires: alcotest_saved_stderr, alcotest_saved_stdout
 function alcotest_after_test (vstdout, vstderr){
-  caml_ml_channels[vstdout] = alcotest_saved_stdout;
-  caml_ml_channels[vstderr] = alcotest_saved_stderr;
+  caml_ml_channel_restore(vstdout, alcotest_saved_stdout);
+  caml_ml_channel_restore(vstderr, alcotest_saved_stderr);
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ depends: [`
`32`	`32`	`]`
`33`	`33`	`conflicts: [`
`34`	`34`	`"result" {< "1.5"}`
	`35`	`+ "js_of_ocaml-compiler" {< "5.8"}`
`35`	`36`	`]`
`36`	`37`	`build: [`
`37`	`38`	`["dune" "subst"] {dev}`