Disable all tests on Windows except manifest

Author: MisterDA

lib/os.ml

@@ -174,13 +174,13 @@ let pread_result ?stderr ~pp argv =
   child >>= fun r ->
   Result.map (fun () -> data) r |> Lwt_result.lift
 
-let pread_all ?stdin ~pp argv =
+let pread_all ?stdin ~pp ?(cmd="") argv =
   with_pipe_from_child @@ fun ~r:r1 ~w:w1 ->
   with_pipe_from_child @@ fun ~r:r2 ~w:w2 ->
   let child =
     Logs.info (fun f -> f "Exec %a" pp_cmd argv);
     !lwt_process_exec ?stdin ~stdout:(`FD_move_safely w1) ~stderr:(`FD_move_safely w2) ~pp
-                      ("", Array.of_list argv)
+                      (cmd, Array.of_list argv)
   in
   let r1 = Lwt_io.(of_fd ~mode:input) r1 in
   let r2 = Lwt_io.(of_fd ~mode:input) r2 in

obuilder.opam

@@ -47,4 +47,5 @@ dev-repo: "git+https://github.com/ocurrent/obuilder.git"
 pin-depends: [
   ["tar.1.2" "git+https://github.com/MisterDA/ocaml-tar.git#47d20548d39337009b6d73309eb2aab346494e76"]
   ["tar-unix.1.2" "git+https://github.com/MisterDA/ocaml-tar.git#47d20548d39337009b6d73309eb2aab346494e76"]
+  ["lwt.5.4.3" "git+https://github.com/MisterDA/lwt.git#dbcd92b754b389dae9537277f8049a04a06aaffa"]
 ]

obuilder.opam.template

@@ -1,4 +1,5 @@
 pin-depends: [
   ["tar.1.2" "git+https://github.com/MisterDA/ocaml-tar.git#47d20548d39337009b6d73309eb2aab346494e76"]
   ["tar-unix.1.2" "git+https://github.com/MisterDA/ocaml-tar.git#47d20548d39337009b6d73309eb2aab346494e76"]
+  ["lwt.5.4.3" "git+https://github.com/MisterDA/lwt.git#dbcd92b754b389dae9537277f8049a04a06aaffa"]
 ]

test/test.ml

@@ -566,6 +566,7 @@ let manifest =
 let test_copy generate =
   Lwt_io.with_temp_dir ~prefix:"test-copy-bash-" @@ fun src_dir ->
   Lwt_io.(with_file ~mode:output) (src_dir / "file") (fun ch -> Lwt_io.write ch "file-data") >>= fun () ->
+  let root = if Sys.unix then "/root" else "C:/Windows" in
     (* Files *)
   let f1hash = Sha256.(string "file-data" |> to_hex) in
   generate ~exclude:[] ~src_dir "file" >>= fun r ->
@@ -581,19 +582,19 @@ let test_copy generate =
   generate ~exclude:[] ~src_dir "../file" >>= fun r ->
   Alcotest.(check manifest) "Parent" (Error (`Msg {|Can't use .. in source paths! (in "../file")|})) r;
   (* Symlinks *)
-  Unix.symlink "/root" (src_dir / "link");
+  Unix.symlink ~to_dir:true root (src_dir / "link");
   generate ~exclude:[] ~src_dir "link" >>= fun r ->
-  Alcotest.(check manifest) "Link" (Ok (`Symlink (("link", "/root")))) r;
+  Alcotest.(check manifest) "Link" (Ok (`Symlink (("link", root)))) r;
   generate ~exclude:[] ~src_dir "link/file" >>= fun r ->
   Alcotest.(check manifest) "Follow link" (Error (`Msg {|Not a regular file: link (in "link/file")|})) r;
   (* Directories *)
   generate ~exclude:["file"] ~src_dir "" >>= fun r ->
   Alcotest.(check manifest) "Tree"
-    (Ok (`Dir ("", [`Symlink ("link", "/root")]))) r;
+    (Ok (`Dir ("", [`Symlink ("link", root)]))) r;
   generate ~exclude:[] ~src_dir "." >>= fun r ->
   Alcotest.(check manifest) "Tree"
     (Ok (`Dir ("", [`File ("file", f1hash);
-                    `Symlink ("link", "/root")]))) r;
+                    `Symlink ("link", root)]))) r;
   Unix.mkdir (src_dir / "dir1") 0o700;
   Unix.mkdir (src_dir / "dir1" / "dir2") 0o700;
   Lwt_io.(with_file ~mode:output) (src_dir / "dir1" / "dir2" / "file2") (fun ch -> Lwt_io.write ch "file2") >>= fun () ->
@@ -614,19 +615,22 @@ let test_copy_ocaml _switch () =
 let test_copy_bash _switch () =
   Os.lwt_process_exec := Os.default_exec;
   let generate ~exclude ~src_dir src =
+    Os.pread ["cygpath"; "-m"; "/usr/bin/bash"] >>= fun bash ->
+    let bash = String.trim bash in
+    Os.pread ["cygpath"; "-m"; src_dir] >>= fun src_dir ->
     let manifest_bash =
       Printf.sprintf "exec %s %S %S %d %s %d %s"
         "./manifest.bash"
-        src_dir
+        (String.trim src_dir)
         "/"
         (List.length exclude)
         (String.concat " " (List.map Filename.quote exclude))
         1
         (Filename.quote src)
     in
-    let argv = [ "/bin/bash"; "--login"; "-c"; manifest_bash ] in
+    let argv = [ "--login"; "-c"; manifest_bash ] in
     let pp f = Os.pp_cmd f argv in
-    Os.pread_all ~pp argv >>= fun (n, stdout, stderr) ->
+    Os.pread_all ~pp ~cmd:bash argv >>= fun (n, stdout, stderr) ->
     if n = 0 then
       Lwt_result.return @@ Manifest.t_of_sexp (Sexplib.Sexp.of_string stdout)
     else if n = 1 then
@@ -688,7 +692,7 @@ let test_cache_id () =
 (*   Lwt_io.(with_file ~mode:output) (src_dir / "dir" / "file2") (fun ch -> Lwt_io.write ch "file2-data") >>= fun () -> *)
 (*   Tar_lwt_unix. *)
 
-let () =
+let main_unix () =
   let open Alcotest_lwt in
   Lwt_main.run begin
     run "OBuilder" [
@@ -720,3 +724,15 @@ let () =
       ];
     ]
   end
+
+let main_win32 () =
+  let open Alcotest_lwt in
+  Lwt_main.run begin
+    run "OBuilder" [
+      "manifest", [
+        test_case "Copy using manifest.bash" `Quick test_copy_bash;
+      ];
+    ]
+  end
+
+let () = if Sys.win32 then main_win32 () else main_unix ()