Skip to content
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

Jump to bottom

Clarify configuration for lib_eio_linux and enable tests on other arches #592

Merged
merged 2 commits into from
Aug 16, 2023
Merged

Clarify configuration for lib_eio_linux and enable tests on other arches #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d2c8f5
Clarify the %{system} values for Linux
dra27 Jul 26, 2023
d5ebfd4
Enable lib_eio_linux tests on all arches
dra27 Jul 26, 2023
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
8 changes: 4 additions & 4 deletions lib_eio_linux/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
(name eio_linux)
(public_name eio_linux)
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Linux-x86
(= %{system} "linux_eabihf") ; Linux-arm32
(= %{system} "linux_elf") ; Linux-x86_32
(= %{system} "elf"))) ; Linux-ppc64
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(foreign_stubs
(language c)
(flags :standard -D_LARGEFILE64_SOURCE)
Expand Down
36 changes: 30 additions & 6 deletions lib_eio_linux/tests/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,59 @@
(library
(name eurcp_lib)
(enabled_if (= %{system} "linux"))
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(modules eurcp_lib)
(libraries eio_linux))

(executable
(name eurcp)
(enabled_if (= %{system} "linux"))
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(modules eurcp)
(libraries cmdliner logs.cli logs.fmt fmt.tty fmt.cli eurcp_lib))

(executable
(name basic_eio_linux)
(enabled_if (= %{system} "linux"))
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(modules basic_eio_linux)
(libraries logs.fmt fmt.tty eurcp_lib))

(executables
(names bench_noop)
(enabled_if (= %{system} "linux"))
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(modules bench_noop)
(libraries eio_linux))

(test
(name test)
(package eio_linux)
(build_if (= %{system} "linux"))
(build_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(modules test)
(libraries alcotest eio_linux))

(mdx
(package eio_linux)
(enabled_if (= %{system} "linux"))
(enabled_if ; See https://github.com/ocaml/dune/issues/4895
(or (= %{system} "linux") ; Historically, just Linux-x86
(= %{system} "linux_eabihf") ; Historically, Linux-arm32
(= %{system} "linux_elf") ; Historically, Linux-x86_32
(= %{system} "elf"))) ; Historically, Linux-ppc64
(deps (package eio_linux)))
Loading