Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-dune for openSUSE:Factory checked in at 2023-10-17 20:24:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-dune (Old) and /work/SRC/openSUSE:Factory/.ocaml-dune.new.20540 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-dune" Tue Oct 17 20:24:47 2023 rev:38 rq:1118206 version:3.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-dune/ocaml-dune.changes 2023-10-02 20:08:39.359529056 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-dune.new.20540/ocaml-dune.changes 2023-10-17 20:24:56.207152718 +0200 @@ -1,0 +2,6 @@ +Tue Oct 10 10:10:10 UTC 2023 - [email protected] + +- Update to version 3.11.1 + see included CHANGES.md file for details + +------------------------------------------------------------------- Old: ---- ocaml-dune-3.11.0.tar.xz New: ---- ocaml-dune-3.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-dune.spec ++++++ --- /var/tmp/diff_new_pack.alYnH9/_old 2023-10-17 20:24:57.063182684 +0200 +++ /var/tmp/diff_new_pack.alYnH9/_new 2023-10-17 20:24:57.063182684 +0200 @@ -25,7 +25,7 @@ %define pkg ocaml-dune %global _buildshell /bin/bash Name: %pkg%nsuffix -Version: 3.11.0 +Version: 3.11.1 Release: 0 %{?ocaml_preserve_bytecode} License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.alYnH9/_old 2023-10-17 20:24:57.139185345 +0200 +++ /var/tmp/diff_new_pack.alYnH9/_new 2023-10-17 20:24:57.143185485 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-dune</param> - <param name="revision">e3bfd215dd35cf702b3af66be03f2912b69b0a0a</param> + <param name="revision">7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/ocaml/dune.git</param> ++++++ ocaml-dune-3.11.0.tar.xz -> ocaml-dune-3.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/CHANGES.md new/ocaml-dune-3.11.1/CHANGES.md --- old/ocaml-dune-3.11.0/CHANGES.md 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/CHANGES.md 2023-10-09 13:08:29.000000000 +0200 @@ -1,3 +1,10 @@ +3.11.1 (2023-10-09) +------------------- + +- Fix `dune rpc` commands on Windows (#8806, fixes #8799, @nojb) + +- Fix `inline_tests` when the partition list is empty (#8849, fixes #8848, @hhugo) + 3.11.0 (2023-09-22) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/ocaml-dune.changes new/ocaml-dune-3.11.1/ocaml-dune.changes --- old/ocaml-dune-3.11.0/ocaml-dune.changes 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/ocaml-dune.changes 2023-10-09 13:08:29.000000000 +0200 @@ -349,3 +349,6 @@ e0db8d7fd refactor: artifact handling (#8729) 05e1b7b03 ci: use opam-monorepo < 0.4 in mirage build (#8734) e3bfd215d (tag: 3.11.0) Prepare 3.11.0 (#8736) +a760f8cd1 Fix `dune rpc` commands on Windows (#8806) (#8892) +4b30514d7 [3.11] Backport #8849 (inline tests) (#8893) +7cbb0e727 (tag: 3.11.1, origin/3.11) Prepare 3.11.1 (#8895) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/src/dune_rpc_client/where.ml new/ocaml-dune-3.11.1/src/dune_rpc_client/where.ml --- old/ocaml-dune-3.11.0/src/dune_rpc_client/where.ml 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/src/dune_rpc_client/where.ml 2023-10-09 13:08:29.000000000 +0200 @@ -47,10 +47,7 @@ | `Ip (`Host host, `Port port) -> Unix.ADDR_INET (Unix.inet_addr_of_string host, port) ;; -let to_string = function - | `Unix p -> sprintf "unix://%s" p - | `Ip (`Host host, `Port port) -> sprintf "%s:%d" host port -;; +let to_string t = Dune_rpc_private.Where.to_string t let rpc_socket_file = let f = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/src/dune_rpc_impl/server.ml new/ocaml-dune-3.11.1/src/dune_rpc_impl/server.ml --- old/ocaml-dune-3.11.0/src/dune_rpc_impl/server.ml 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/src/dune_rpc_impl/server.ml 2023-10-09 13:08:29.000000000 +0200 @@ -433,6 +433,9 @@ Path.mkdir_p (Path.build (Path.Build.parent_exn socket_file)); match Csexp_rpc.Server.create [ Where.to_socket where ] ~backlog:10 with | Ok s -> + (match where with + | `Ip _ -> Io.write_file (Path.build socket_file) (Where.to_string where) + | `Unix _ -> ()); at_exit (fun () -> Path.Build.unlink_no_err socket_file); s | Error `Already_in_use -> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/src/dune_rules/inline_tests.ml new/ocaml-dune-3.11.1/src/dune_rules/inline_tests.ml --- old/ocaml-dune-3.11.0/src/dune_rules/inline_tests.ml 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/src/dune_rules/inline_tests.ml 2023-10-09 13:08:29.000000000 +0200 @@ -347,15 +347,18 @@ List.map partitions_flags ~f:(fun p -> action mode (flags p)) |> Action_builder.all and+ () = Action_builder.paths source_files in - let run_tests = Action.concurrent actions in - let diffs = - List.map source_files ~f:(fun fn -> - Path.as_in_build_dir_exn fn - |> Path.Build.extend_basename ~suffix:".corrected" - |> Action.diff ~optional:true fn) - |> Action.concurrent - in - Action.Full.make ~sandbox @@ Action.progn [ run_tests; diffs ])) + match actions with + | [] -> Action.Full.empty + | _ :: _ -> + let run_tests = Action.concurrent actions in + let diffs = + List.map source_files ~f:(fun fn -> + Path.as_in_build_dir_exn fn + |> Path.Build.extend_basename ~suffix:".corrected" + |> Action.diff ~optional:true fn) + |> Action.concurrent + in + Action.Full.make ~sandbox @@ Action.progn [ run_tests; diffs ])) ;; let gen_rules c ~(info : Info.t) ~backends = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/action-runner/worker.t new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/action-runner/worker.t --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/action-runner/worker.t 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/action-runner/worker.t 2023-10-09 13:08:29.000000000 +0200 @@ -1,6 +1,6 @@ Connecting without server should fail $ DUNE_RPC="unix:path=foo" dune internal action-runner start foobar 2>&1 | sed -n '/^Error/,/backtrace:/p' - Error: failed to connect to RPC server unix://foo + Error: failed to connect to RPC server unix:path=foo Unix.Unix_error(Unix.ENOENT, "connect", "") backtrace: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/backend/fake_backend_runner.ml new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/backend/fake_backend_runner.ml --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/backend/fake_backend_runner.ml 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/backend/fake_backend_runner.ml 2023-10-09 13:08:29.000000000 +0200 @@ -30,14 +30,14 @@ let run () = Arg.parse speclist anon_fun usage_msg; + if !libname = "" then failwith "Should specify libname"; if !list_partitions then let partitions = List.fold_left - (fun acc t -> StringSet.add t.partition acc) + (fun acc t -> if !libname = t.libname then StringSet.add t.partition acc else acc) StringSet.empty !tests in - StringSet.iter print_endline partitions - else if !libname = "" then failwith "Should specify libname"; + StringSet.iter print_endline partitions; List.iter (fun t -> if t.libname = !libname && t.partition = !partition then ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/run.t 2023-10-09 13:08:29.000000000 +0200 @@ -27,3 +27,14 @@ p1 p2 p3 + + + $ dune build --display short @test3/runtest + ocamlc test3/.test_lib3.inline-tests/.test_lib3.inline-tests.eobjs/byte/dune__exe__Inline_test_runner_test_lib3.{cmi,cmo,cmt} + ocamlopt test3/.test_lib3.inline-tests/.test_lib3.inline-tests.eobjs/native/dune__exe__Inline_test_runner_test_lib3.{cmx,o} + ocamlopt test3/.test_lib3.inline-tests/inline_test_runner_test_lib3.exe + inline_test_runner_test_lib3 test3/.test_lib3.inline-tests/partitions-best + +See that we have no partition. + + $ cat _build/default/test3/.test_lib3.inline-tests/partitions-best diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test2/test_lib2.ml new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test2/test_lib2.ml --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test2/test_lib2.ml 2023-09-22 15:18:56.000000000 +0200 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test2/test_lib2.ml 2023-10-09 13:08:29.000000000 +0200 @@ -1,19 +1,23 @@ let () = - Fake_backend_runner.register ~libname:"test_lib" ~partition:"p1" "first test" + Fake_backend_runner.register ~libname:"test_lib2" ~partition:"p1" "first test" (fun () -> assert true) let () = - Fake_backend_runner.register ~libname:"test_lib" ~partition:"p1" "second test" + Fake_backend_runner.register ~libname:"test_lib2" ~partition:"p1" "second test" (fun () -> () ) let () = - Fake_backend_runner.register ~libname:"test_lib" ~partition:"p2" "first test" + Fake_backend_runner.register ~libname:"test_lib2" ~partition:"p2" "first test" (fun () -> ()) let () = - Fake_backend_runner.register ~libname:"test_lib" ~partition:"p3" "first test" + Fake_backend_runner.register ~libname:"test_lib2" ~partition:"p3" "first test" (fun () -> failwith "This failure is expected") let () = Fake_backend_runner.register ~libname:"other_lib" ~partition:"p1" "second test" (fun () -> assert false) + +let () = + Fake_backend_runner.register ~libname:"other_lib" ~partition:"pn" + "second test" (fun () -> assert false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/dune new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/dune --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/dune 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/dune 2023-10-09 13:08:29.000000000 +0200 @@ -0,0 +1,4 @@ +(library + (name test_lib3) + (libraries fake_backend_runner) + (inline_tests (backend fake_backend_2))) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/test_lib3.ml new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/test_lib3.ml --- old/ocaml-dune-3.11.0/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/test_lib3.ml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-dune-3.11.1/test/blackbox-tests/test-cases/inline_tests/parallel.t/test3/test_lib3.ml 2023-10-09 13:08:29.000000000 +0200 @@ -0,0 +1,3 @@ +let () = + Fake_backend_runner.register ~libname:"other_lib" ~partition:"p1" + "second test" (fun () -> assert false)
