From a308d3ec2b3027615ca0b612881991f8134aa7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?=
 <francois.thire@nomadic-labs.com>
Date: Tue, 1 Oct 2024 21:16:40 +0200
Subject: [PATCH 1/3] Manifest: Introduce tezt-bam as a dependency

---
 manifest/externals.ml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifest/externals.ml b/manifest/externals.ml
index f2b1154c0e01..15d67b0df32e 100644
--- a/manifest/externals.ml
+++ b/manifest/externals.ml
@@ -38,6 +38,8 @@ let asetmap = external_lib "asetmap" V.(at_least "0.8.1")
 
 let astring = external_lib "astring" V.True
 
+let bam_ppx = external_lib "bam-ppx" V.True
+
 let bheap = external_lib "bheap" V.(at_least "2.0.0")
 
 let bigarray_compat = external_lib "bigarray-compat" V.True
@@ -287,6 +289,8 @@ let crowbar = external_lib "crowbar" V.(at_least "0.2")
 
 let ppx_hash = external_lib "ppx_hash" V.True
 
+let tezt_bam = external_lib "tezt-bam" V.True
+
 let tezt_lib =
   external_lib
     "tezt"
-- 
GitLab


From 26114e3a2465a802decc013e22a184d0af3d63ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?=
 <francois.thire@nomadic-labs.com>
Date: Wed, 2 Oct 2024 10:47:58 +0200
Subject: [PATCH 2/3] Manifest: Update the lock file

---
 opam/virtual/octez-deps.opam.locked | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked
index 2c070f2ab3c3..8c3feea92558 100644
--- a/opam/virtual/octez-deps.opam.locked
+++ b/opam/virtual/octez-deps.opam.locked
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "octez-deps"
-version: "dev"
+version: "~dev"
 synopsis:
   "Virtual package depending on Octez dependencies (profile: octez-deps)"
 description:
@@ -20,6 +20,8 @@ depends: [
   "asetmap" {= "0.8.1"}
   "asn1-combinators" {= "0.2.6"}
   "astring" {= "0.8.5"}
+  "bam" {= "0.2"}
+  "bam-ppx" {= "0.2"}
   "base" {= "v0.16.3"}
   "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
@@ -208,6 +210,7 @@ depends: [
   "terminal" {= "0.4.0"}
   "tezos-sapling-parameters" {= "1.1.0"}
   "tezt" {= "4.1.0"}
+  "tezt-bam" {= "0.2"}
   "time_now" {= "v0.16.0"}
   "tls" {= "0.17.5"}
   "tls-lwt" {= "0.17.5"}
-- 
GitLab


From 8b805ad2b0dfd34b33bbdfb1ed4368cf1bfff540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?=
 <francois.thire@nomadic-labs.com>
Date: Tue, 1 Oct 2024 21:17:52 +0200
Subject: [PATCH 3/3] Stdlib/Unix/Test: Use `tezt-bam`

---
 manifest/product_octez.ml     | 2 ++
 opam/octez-libs.opam          | 2 ++
 opam/virtual/octez-deps.opam  | 2 ++
 src/lib_stdlib_unix/test/dune | 4 +++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml
index e09c605a01b8..30e94506a87a 100644
--- a/manifest/product_octez.ml
+++ b/manifest/product_octez.ml
@@ -1442,6 +1442,7 @@ let _octez_stdlib_unix_test =
     ]
     ~path:"src/lib_stdlib_unix/test/"
     ~opam:"octez-libs"
+    ~preprocess:(pps bam_ppx)
     ~deps:
       [
         octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib";
@@ -1450,6 +1451,7 @@ let _octez_stdlib_unix_test =
         octez_test_helpers |> open_;
         qcheck_alcotest;
         alcotezt;
+        tezt_bam;
       ]
 
 let octez_dal_config =
diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam
index a43b93dccb61..620f2533f8fe 100644
--- a/opam/octez-libs.opam
+++ b/opam/octez-libs.opam
@@ -82,6 +82,8 @@ depends: [
   "octez-rust-deps" { = version }
   "lwt-watcher" { = "0.2" }
   "bigstring" {with-test}
+  "bam-ppx" {with-test}
+  "tezt-bam" {with-test}
 ]
 x-opam-monorepo-opam-provided: [
   "tezos-sapling-parameters"
diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam
index c749f7bed0f4..a9945f8aa584 100644
--- a/opam/virtual/octez-deps.opam
+++ b/opam/virtual/octez-deps.opam
@@ -15,6 +15,7 @@ depends: [
   "alcotest-lwt" { >= "1.5.0" }
   "asetmap" { >= "0.8.1" }
   "astring"
+  "bam-ppx"
   "base-unix"
   "bheap" { >= "2.0.0" }
   "bigarray-compat"
@@ -104,6 +105,7 @@ depends: [
   "tar-unix" { >= "2.0.1" & < "3.0.0" }
   "tezos-sapling-parameters" { >= "1.1.0" }
   "tezt" { >= "4.1.0" & < "5.0.0" }
+  "tezt-bam"
   "tls-lwt" { >= "0.16.0" }
   "uri" { >= "3.1.0" }
   "uutf"
diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune
index 274016a3cece..db8aa2aff86b 100644
--- a/src/lib_stdlib_unix/test/dune
+++ b/src/lib_stdlib_unix/test/dune
@@ -11,7 +11,9 @@
   octez-libs.event-logging
   octez-libs.test-helpers
   qcheck-alcotest
-  octez-alcotezt)
+  octez-alcotezt
+  tezt-bam)
+ (preprocess (pps bam-ppx))
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-- 
GitLab