From 690a53aa70cfd6c9f12b0055583c1f63c4486ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 12 Jun 2024 15:25:15 +0100 Subject: [PATCH 1/2] Link just qcheck-core, not qcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qcheck is in the wrong part of xs-opam currently, and although we're moving it this test really only needs qcheck-core, so link only that to fix an internal CI failure. Signed-off-by: Edwin Török --- ocaml/libs/sexpr/test/dune | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml/libs/sexpr/test/dune b/ocaml/libs/sexpr/test/dune index 46433eddf97..2e60f3cd9b6 100644 --- a/ocaml/libs/sexpr/test/dune +++ b/ocaml/libs/sexpr/test/dune @@ -1,4 +1,4 @@ (test (name test_sexpr) (modules test_sexpr) - (libraries sexpr astring rresult qcheck alcotest threads)) + (libraries sexpr astring rresult qcheck-core alcotest threads)) From d5f182541d9a465af2a142fdd1969b13e5193e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 12 Jun 2024 15:32:36 +0100 Subject: [PATCH 2/2] Define qcheck-core dependency in opam packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edwin Török --- sexpr.opam.template | 1 + wsproxy.opam | 2 +- wsproxy.opam.template | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sexpr.opam.template b/sexpr.opam.template index 0448d5c4d16..d83e0f2a493 100644 --- a/sexpr.opam.template +++ b/sexpr.opam.template @@ -11,6 +11,7 @@ depends: [ "ocaml" "dune" "astring" + "qcheck-core" {with-test} "xapi-stdext-threads" ] synopsis: "Library required by xapi" diff --git a/wsproxy.opam b/wsproxy.opam index baceb5d55fe..d0ee062cf1c 100644 --- a/wsproxy.opam +++ b/wsproxy.opam @@ -22,7 +22,7 @@ depends: [ "re" "uuid" "ounit2" {with-test} - "qcheck" {with-test} + "qcheck-core" {with-test} ] tags: [ "org:xapi-project" ] synopsis: "Websockets proxy for VNC traffic" diff --git a/wsproxy.opam.template b/wsproxy.opam.template index 5a5fdd00975..483d486d4c0 100644 --- a/wsproxy.opam.template +++ b/wsproxy.opam.template @@ -20,7 +20,7 @@ depends: [ "re" "uuid" "ounit2" {with-test} - "qcheck" {with-test} + "qcheck-core" {with-test} ] tags: [ "org:xapi-project" ] synopsis: "Websockets proxy for VNC traffic"