[gentoo-commits] repo/gentoo:master commit in: dev-ml/dune-private-libs/files/, dev-ml/dune-private-libs/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/dune-private-libs/files/, dev-ml/dune-private-libs/

[Alfredo Tupone]

commit:     ba5ae9808f855b816d754c48c654e93d1958313e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 07:53:35 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 07:54:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5ae980

dev-ml/dune-private-libs: fix test

Closes: https://bugs.gentoo.org/872266

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../dune-private-libs-2.9.3.ebuild                 |  9 ++++++
 .../files/dune-private-libs-2.9.3-test.patch       | 32 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
index 051a8304752e..c518302b4ac9 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
@@ -32,6 +32,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
 # TODO for test deps:
 # Add cram?
 # Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
@@ -71,6 +73,11 @@ src_prepare() {
 		test/blackbox-tests/test-cases/merlin/server.t
 		test/blackbox-tests/test-cases/github1946.t
 		test/blackbox-tests/test-cases/github759.t
+		test/blackbox-tests/test-cases/merlin/default-based-context.t
+		otherlibs/site/test/run.t
+
+		# Deprecated warnings
+		test/blackbox-tests/test-cases/toplevel-integration.t
 
 		# Wants nodejs!
 		test/blackbox-tests/test-cases/jsoo/simple.t
@@ -90,6 +97,8 @@ src_prepare() {
 		test/blackbox-tests/test-cases/coq/ml-lib.t
 		test/blackbox-tests/test-cases/coq/extract.t
 		test/blackbox-tests/test-cases/coq/compose-plugin.t
+		test/blackbox-tests/test-cases/coq/flags.t
+		test/blackbox-tests/test-cases/coq/env.t
 
 		# Unpackaged dependencies (a rabbit hole for now)
 		# utop -> lambda-term, zed

diff --git a/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch
new file mode 100644
index 000000000000..661ed791473a
--- /dev/null
+++ b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch
@@ -0,0 +1,32 @@
+From 4a8fa5757277be6e9bbd3698fd4d4336dadae520 Mon Sep 17 00:00:00 2001
+From: Rudi Grinberg <me@rgrinberg.com>
+Date: Sat, 26 Jun 2021 21:54:55 -0700
+Subject: [PATCH] Fix test bug_4219.t
+
+It was missing EOF end markers
+
+Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
+---
+ otherlibs/site/test/bug_4219.t | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/otherlibs/site/test/bug_4219.t b/otherlibs/site/test/bug_4219.t
+index 96d4794f43..eab868d676 100644
+--- a/otherlibs/site/test/bug_4219.t
++++ b/otherlibs/site/test/bug_4219.t
+@@ -7,6 +7,7 @@ Test when sites name which are ocaml keyword
+   > (package
+   >  (name my-package)
+   >  (sites (lib include)))
++  > EOF
+ 
+   $ cat >dune <<EOF
+   > (library (name lib) (libraries dune-site dune-site.plugins))
+@@ -14,6 +15,6 @@ Test when sites name which are ocaml keyword
+   > (generate_sites_module
+   >  (module sites)
+   >  (plugins (my-package include)))
+-
++  > EOF
+ 
+   $ dune build