Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .github/workflows/js_of_ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ jobs:
skip-effects: false
skip-test: false
skip-doc: false
- os: ubuntu-latest
os-name: Ubuntu
ocaml-name: "5.5.0~alpha3"
ocaml-compiler: "ocaml-compiler.5.5.0~alpha3"
skip-effects: false
skip-test: false
skip-doc: true
- os: ubuntu-latest
os-name: Ubuntu
ocaml-compiler: "5.1"
Expand Down Expand Up @@ -148,6 +155,9 @@ jobs:
ox: https://github.com/oxcaml/opam-repository.git#${{ env.OXCAML_OPAM_REPO_REF }}
if: ${{ endsWith(matrix.ocaml-compiler, '+ox') }}

- run: opam repo add alpha git+https://github.com/kit-ty-kate/opam-alpha-repository.git
if: contains( matrix.ocaml-compiler, 'alpha3')

# Work-around a race between reinstalling mingw-w64-shims
# (because of conf-pkg-config optional dep) and installing other
# packages that implicitly depend on mingw-w64-shims.
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/wasm_of_ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ jobs:
all_jane_street_tests:
- false
include:
- os: ubuntu-latest
os-name: Ubuntu
ocaml-name: "5.5.0~alpha3"
ocaml-compiler: "ocaml-compiler.5.5.0~alpha3"
separate_compilation: true
jane_street_tests: false
all_jane_street_tests: false
- os: macos-latest
os-name: MacOS
ocaml-compiler: "5.3"
Expand Down Expand Up @@ -129,6 +136,9 @@ jobs:
- run: opam install conf-pkg-config conf-mingw-w64-gcc-i686 conf-mingw-w64-g++-x86_64
if: runner.os == 'Windows'

- run: opam repo add alpha git+https://github.com/kit-ty-kate/opam-alpha-repository.git
if: contains( matrix.ocaml-compiler, 'alpha3')

- name: Pin wasm_of_ocaml
working-directory: ./wasm_of_ocaml
run: opam pin . -n --with-version 6.0.1+ox
Expand Down
45 changes: 45 additions & 0 deletions compiler/tests-check-prim/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,51 @@
+toplevel.js
%{dep:unix.bc}))))

(rule
(targets main.5.5.output)
(mode
(promote (until-clean)))
(enabled_if (and (>= %{ocaml_version} 5.5)(< %{ocaml_version} 5.6)(not %{oxcaml_supported})))
(action
(with-stdout-to
%{targets}
(run
%{bin:js_of_ocaml}
check-runtime
+dynlink.js
+toplevel.js
%{dep:main.bc}))))

(rule
(targets unix-Win32.5.5.output)
(mode
(promote (until-clean)))
(enabled_if (and (>= %{ocaml_version} 5.5)(< %{ocaml_version} 5.6)(= %{os_type} Win32)(not %{oxcaml_supported})))
(action
(with-stdout-to
%{targets}
(run
%{bin:js_of_ocaml}
check-runtime
+dynlink.js
+toplevel.js
%{dep:unix.bc}))))

(rule
(targets unix-Unix.5.5.output)
(mode
(promote (until-clean)))
(enabled_if (and (>= %{ocaml_version} 5.5)(< %{ocaml_version} 5.6)(= %{os_type} Unix)(not %{oxcaml_supported})))
(action
(with-stdout-to
%{targets}
(run
%{bin:js_of_ocaml}
check-runtime
+dynlink.js
+toplevel.js
%{dep:unix.bc}))))

(rule
(targets main.5.2+ox.output)
(mode
Expand Down
2 changes: 1 addition & 1 deletion compiler/tests-check-prim/gen_dune.ml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ let rule bc ocaml_version os_type ocaml_variant =

let () =
let versions : (version * variant) list =
[ `V4_14, `Mainstream; `V5_4, `Mainstream; `V5_2, `OxCaml ]
[ `V4_14, `Mainstream; `V5_4, `Mainstream; `V5_5, `Mainstream; `V5_2, `OxCaml ]
in
set_binary_mode_out stdout true;
List.iter
Expand Down
202 changes: 202 additions & 0 deletions compiler/tests-check-prim/main.5.5.output
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
Missing
-------

From main.bc:
caml_assume_no_perform
caml_continuation_use
caml_int_as_pointer
caml_jsoo_runtime_value
caml_reset_afl_instrumentation
debugger

Unused
-------

From +array.js:
caml_check_bound

From +bigarray.js:
caml_ba_create_from (deprecated)
caml_ba_init

From +bigstring.js:
caml_bigstring_blit_ba_to_ba
caml_bigstring_blit_ba_to_bytes
caml_bigstring_blit_bytes_to_ba
caml_bigstring_blit_string_to_ba
caml_bigstring_memcmp
caml_hash_mix_bigstring

From +effect.js:
jsoo_effect_not_supported

From +fs.js:
caml_ba_map_file
caml_ba_map_file_bytecode
caml_fs_init
jsoo_create_file
jsoo_create_file_extern

From +graphics.js:
caml_gr_arc_aux
caml_gr_blit_image
caml_gr_clear_graph
caml_gr_close_graph
caml_gr_close_subwindow
caml_gr_create_image
caml_gr_current_x
caml_gr_current_y
caml_gr_display_mode
caml_gr_doc_of_state
caml_gr_draw_arc
caml_gr_draw_char
caml_gr_draw_image
caml_gr_draw_rect
caml_gr_draw_str
caml_gr_draw_string
caml_gr_dump_image
caml_gr_fill_arc
caml_gr_fill_poly
caml_gr_fill_rect
caml_gr_lineto
caml_gr_make_image
caml_gr_moveto
caml_gr_open_graph
caml_gr_open_subwindow
caml_gr_plot
caml_gr_point_color
caml_gr_remember_mode
caml_gr_resize_window
caml_gr_set_color
caml_gr_set_font
caml_gr_set_line_width
caml_gr_set_text_size
caml_gr_set_window_title
caml_gr_sigio_handler
caml_gr_sigio_signal
caml_gr_size_x
caml_gr_size_y
caml_gr_state
caml_gr_state_create
caml_gr_state_get
caml_gr_state_init
caml_gr_state_set
caml_gr_synchronize
caml_gr_text_size
caml_gr_wait_event
caml_gr_window_id

From +hash.js:
caml_hash_mix_int64

From +ints.js:
caml_div
caml_mod

From +jslib.js:
caml_is_js
caml_trampoline
caml_trampoline_return
caml_wrap_exception

From +marshal.js:
caml_marshal_constants

From +mlBytes.js:
caml_array_of_bytes (deprecated)
caml_array_of_string (deprecated)
caml_bytes_of_utf16_jsstring
caml_new_string (deprecated)
caml_string_concat
caml_to_js_string (deprecated)

From +runtime_events.js:
caml_runtime_events_create_cursor
caml_runtime_events_free_cursor
caml_runtime_events_read_poll
caml_runtime_events_user_resolve

From +stdlib.js:
caml_get_global
caml_get_global_predef
caml_is_printable
caml_maybe_print_stats
caml_register_global_by_index
caml_register_global_predef
caml_set_link_info

From +sys.js:
caml_fatal_uncaught_exception
caml_format_exception
caml_is_special_exception
caml_set_static_env
caml_sys_const_naked_pointers_checked

From +toplevel.js:
jsoo_get_runtime_aliases
jsoo_toplevel_init_compile
jsoo_toplevel_init_reloc

From +unix.js:
caml_strerror
caml_unix_access
caml_unix_chdir
caml_unix_chmod
caml_unix_cleanup
caml_unix_close
caml_unix_closedir
caml_unix_fchmod
caml_unix_filedescr_of_fd
caml_unix_findclose
caml_unix_findfirst
caml_unix_findnext
caml_unix_fstat
caml_unix_fstat_64
caml_unix_fsync
caml_unix_ftruncate
caml_unix_ftruncate_64
caml_unix_getegid
caml_unix_geteuid
caml_unix_getgid
caml_unix_getpwnam
caml_unix_gettimeofday
caml_unix_getuid
caml_unix_gmtime
caml_unix_has_symlink
caml_unix_inchannel_of_filedescr
caml_unix_inet_addr_of_string
caml_unix_isatty
caml_unix_link
caml_unix_localtime
caml_unix_lookup_file
caml_unix_lseek
caml_unix_lseek_64
caml_unix_lstat
caml_unix_lstat_64
caml_unix_mkdir
caml_unix_mktime
caml_unix_open
caml_unix_opendir
caml_unix_outchannel_of_filedescr
caml_unix_read
caml_unix_read_bigarray
caml_unix_readdir
caml_unix_readlink
caml_unix_rename
caml_unix_rewinddir
caml_unix_rmdir
caml_unix_single_write
caml_unix_startup
caml_unix_stat
caml_unix_stat_64
caml_unix_symlink
caml_unix_time
caml_unix_times
caml_unix_truncate
caml_unix_truncate_64
caml_unix_unlink
caml_unix_utimes
caml_unix_write
caml_unix_write_bigarray
unix_error_message

Loading
Loading