From 0d2c8f59073954fa7a6867c6d699ee4e73cd82d2 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Wed, 26 Jul 2023 10:15:43 +0100 Subject: [PATCH 1/2] Clarify the %{system} values for Linux --- lib_eio_linux/dune | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_eio_linux/dune b/lib_eio_linux/dune index 86614e0aa..41ceafad6 100644 --- a/lib_eio_linux/dune +++ b/lib_eio_linux/dune @@ -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) From d5ebfd496a21e7671d81704ceca428103b88c5e2 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Wed, 26 Jul 2023 10:25:51 +0100 Subject: [PATCH 2/2] Enable lib_eio_linux tests on all arches --- lib_eio_linux/tests/dune | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/lib_eio_linux/tests/dune b/lib_eio_linux/tests/dune index 9e57d34b9..257245535 100644 --- a/lib_eio_linux/tests/dune +++ b/lib_eio_linux/tests/dune @@ -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)))