compile/link/execute ocaml tests via cargo

.circleci/config.yml

@@ -47,10 +47,7 @@ jobs:
           command: |
             source "$HOME/.cargo/env"
             eval $(opam env)
-            OCAMLLIB=$(ocamlopt.opt -config | grep standard_library: | awk '{ print $2 }');export OCAMLLIB
             cargo build
-            (cd ocamlpool/test&& ./ocamlpool_test.sh)
-            (cd rust/ocamlrep/test&& ./ocamlrep_test.sh)
             cargo test
 
   macos-build-and-test:
@@ -67,10 +64,7 @@ jobs:
           command: |
             source "$HOME/.cargo/env"
             eval $(opam env)
-            OCAMLLIB=$(ocamlopt.opt -config | grep standard_library: | awk '{ print $2 }');export OCAMLLIB
             cargo build
-            (cd ocamlpool/test&& ./ocamlpool_test.sh)
-            (cd rust/ocamlrep/test&& ./ocamlrep_test.sh)
             cargo test
 
 workflows:

README.md

@@ -11,7 +11,6 @@ This project is stand-alone and requires or works with:
 ## Building ocamlrep
 Assume an opam installation on a `4.14.0` like switch. From the repository root,
 ```bash
-    OCAMLLIB=$(ocamlopt.opt -config | grep standard_library: | awk '{ print $2 }'); export OCAMLLIB
     cargo build
 ```
 

ocamlpool/build.rs

@@ -2,10 +2,23 @@
 // --set-switch)"`) then to find the prevailing standard library caml
 // headers, `OCAMLLIB=$(ocamlopt.opt -config | grep standard_library:
 // | awk '{ print $2 }')`.
+fn ocamllib_dir() -> std::path::PathBuf {
+    let mut sh = std::process::Command::new("sh");
+    sh.args([
+        "-c",
+        "ocamlopt.opt -config | grep standard_library: | awk '{ print $2 }'",
+    ]);
+    std::path::Path::new(
+        std::str::from_utf8(&sh.output().unwrap().stdout)
+            .unwrap()
+            .trim(),
+    )
+    .to_path_buf()
+}
 
 fn main() {
     cc::Build::new()
-        .include(env!("OCAMLLIB"))
+        .include(ocamllib_dir().as_path().to_str().unwrap())
         .file("ocamlpool.c")
         .compile("ocamlpool");
 }

ocamlpool/test/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [lib]
 path = "ocamlpool_test.rs"
-test = false
+test = true # Don't forget to update the buck TARGETS file!
 doctest = false
 crate-type = ["lib", "staticlib"]
 

ocamlpool/test/ocamlpool_test.ml

@@ -13,4 +13,8 @@ external test : unit -> unit = "test"
  * in order to allocate memory for ocaml. Calling rust from ocaml
  * is a good way of ensuring this dependecy is built.
  *)
-let () = test ()
+let () = begin
+    print_endline "[ocamlpool_test][info]: start";
+    test ();
+    print_endline "[ocamlpool_test][info]: finish"
+end

ocamlpool/test/ocamlpool_test.rs

@@ -3,6 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
+#![feature(exit_status_error)]
+
 use ocamlrep_ocamlpool::ocaml_ffi;
 
 extern "C" {
@@ -31,3 +33,80 @@ ocaml_ffi! {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::process::{Command, ExitStatusError};
+
+    fn cmd(prog: &str, args: &[&str]) -> Command {
+        let mut prog_cmd = Command::new(prog);
+        prog_cmd.args(args);
+        prog_cmd
+    }
+
+    fn ocamlopt_cmd(args: &[&str]) -> Command {
+        cmd("ocamlopt.opt", args)
+    }
+
+    fn sh_cmd(args: &[&str]) -> Command {
+        cmd("sh", args)
+    }
+
+    fn cargo_cmd(args: &[&str]) -> Command {
+        cmd("cargo", args)
+    }
+
+    fn workspace_dir(ds: &[&str]) -> std::path::PathBuf {
+        let mut cargo_cmd = cargo_cmd(&["locate-project", "--workspace", "--message-format=plain"]);
+        let output = cargo_cmd.output().unwrap().stdout;
+        let root_cargo_toml = std::path::Path::new(std::str::from_utf8(&output).unwrap().trim());
+        let mut p = root_cargo_toml.parent().unwrap().to_path_buf();
+        for d in ds {
+            p.push(d);
+        }
+        p
+    }
+
+    fn run(mut cmd: Command) -> Result<(), ExitStatusError> {
+        cmd.spawn().unwrap().wait().ok().unwrap().exit_ok()
+    }
+
+    fn fmt_exit_status_err(err: ExitStatusError) -> String {
+        format!("error status: {err}")
+    }
+
+    fn build_flavor() -> &'static str {
+        if cfg!(debug_assertions) {
+            "debug"
+        } else {
+            "release"
+        }
+    }
+
+    #[test]
+    fn ocamlpool_test() {
+        let compile_cmd = ocamlopt_cmd(&[
+            "-verbose",
+            "-c",
+            "ocamlpool_test.ml",
+            "-o",
+            "ocamlpool_test_ml.cmx",
+        ]);
+        assert_eq!(run(compile_cmd).map_err(fmt_exit_status_err), Ok(()));
+        let link_cmd = ocamlopt_cmd(&[
+            "-verbose",
+            "-o",
+            "ocamlpool_test",
+            "ocamlpool_test_ml.cmx",
+            "-ccopt",
+            &("-L".to_owned() + workspace_dir(&["target", build_flavor()]).to_str().unwrap()),
+            "-cclib",
+            "-locamlpool_test",
+            "-cclib",
+            "-locamlpool",
+        ]);
+        assert_eq!(run(link_cmd).map_err(fmt_exit_status_err), Ok(()));
+        let ocamlpool_test_cmd = sh_cmd(&["-c", "./ocamlpool_test"]);
+        assert_eq!(run(ocamlpool_test_cmd).map_err(fmt_exit_status_err), Ok(()));
+    }
+}

rust/ocamlrep/test/test_bindings.rs

@@ -2,6 +2,7 @@
 //
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
+#![feature(exit_status_error)]
 
 use std::cell::RefCell;
 use std::collections::BTreeMap;
@@ -286,3 +287,82 @@ pub extern "C" fn roundtrip_int64(value: usize) -> usize {
     let i = unsafe { ocamlrep_caml_builtins::Int64::from_ocaml(value).unwrap() };
     val(i)
 }
+
+#[cfg(test)]
+mod tests {
+    use std::process::{Command, ExitStatusError};
+
+    fn cmd(prog: &str, args: &[&str]) -> Command {
+        let mut prog_cmd = Command::new(prog);
+        prog_cmd.args(args);
+        prog_cmd
+    }
+
+    fn ocamlopt_cmd(args: &[&str]) -> Command {
+        cmd("ocamlopt.opt", args)
+    }
+
+    fn sh_cmd(args: &[&str]) -> Command {
+        cmd("sh", args)
+    }
+
+    fn cargo_cmd(args: &[&str]) -> Command {
+        cmd("cargo", args)
+    }
+
+    fn workspace_dir(ds: &[&str]) -> std::path::PathBuf {
+        let mut cargo_cmd = cargo_cmd(&["locate-project", "--workspace", "--message-format=plain"]);
+        let output = cargo_cmd.output().unwrap().stdout;
+        let root_cargo_toml = std::path::Path::new(std::str::from_utf8(&output).unwrap().trim());
+        let mut p = root_cargo_toml.parent().unwrap().to_path_buf();
+        for d in ds {
+            p.push(d);
+        }
+        p
+    }
+
+    fn run(mut cmd: Command) -> Result<(), ExitStatusError> {
+        cmd.spawn().unwrap().wait().ok().unwrap().exit_ok()
+    }
+
+    fn fmt_exit_status_err(err: ExitStatusError) -> String {
+        format!("error status: {err}")
+    }
+
+    fn build_flavor() -> &'static str {
+        if cfg!(debug_assertions) {
+            "debug"
+        } else {
+            "release"
+        }
+    }
+    #[test]
+    fn ocamlrep_test() {
+        let mut compile_cmd = ocamlopt_cmd(&[
+            "-verbose",
+            "-c",
+            "test_ocamlrep.ml",
+            "-o",
+            "test_ocamlrep_ml.cmx",
+        ]);
+        compile_cmd.current_dir("..");
+        assert_eq!(run(compile_cmd).map_err(fmt_exit_status_err), Ok(()));
+        let mut link_cmd = ocamlopt_cmd(&[
+            "-verbose",
+            "-o",
+            "ocamlrep_test",
+            "test_ocamlrep_ml.cmx",
+            "-ccopt",
+            &("-L".to_owned() + workspace_dir(&["target", build_flavor()]).to_str().unwrap()),
+            "-cclib",
+            "-ltest_bindings",
+            "-cclib",
+            "-locamlpool",
+        ]);
+        link_cmd.current_dir("..");
+        assert_eq!(run(link_cmd).map_err(fmt_exit_status_err), Ok(()));
+        let mut ocamlpool_test_cmd = sh_cmd(&["-c", "./ocamlrep_test"]);
+        ocamlpool_test_cmd.current_dir("..");
+        assert_eq!(run(ocamlpool_test_cmd).map_err(fmt_exit_status_err), Ok(()));
+    }
+}

rust/ocamlrep/test/test_bindings/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [lib]
 path = "../test_bindings.rs"
-test = false
+test = true # Don't forget to update the buck TARGETS file!
 doctest = false
 crate-type = ["lib", "staticlib"]
 

rust/ocamlrep/test/test_ocamlrep.ml

@@ -823,4 +823,8 @@ let test_cases =
 
 let main () = List.iter (fun test -> test ()) test_cases
 
-let () = main ()
+let () = begin
+  print_endline "[ocamlrep_test][info]: start";
+  main ();
+  print_endline "[ocamlrep_test][info]: finish"
+end

rust/ocamlrep_marshal/cargo/ocamlrep_marshal_ffi_bindings/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [lib]
 path = "../../ocamlrep_marshal_ffi_bindings.rs"
-test = false
+#test = true Remember to update the buck TARGETS file!
 doctest = false
 crate-type = ["lib", "staticlib"]