[libnbd PATCH] ocaml: Fix tests when ocamlopt is not available
Fixes commit 42cb77be8c29de57f2f523688ea375762715d23f. --- ocaml/tests/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml/tests/Makefile.am b/ocaml/tests/Makefile.am index dfb23ff..56519c0 100644 --- a/ocaml/tests/Makefile.am +++ b/ocaml/tests/Makefile.am @@ -100,7 +100,10 @@ endif TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 OCAMLRUNPARAM=b LOG_COMPILER = $(top_builddir)/run -TESTS = $(tests_bc) $(tests_opt) +TESTS = $(tests_bc) +if HAVE_OCAMLOPT +TESTS += $(tests_opt) +endif endif HAVE_NBDKIT endif HAVE_OCAML -- 2.21.0
On 9/23/19 10:35 AM, Pino Toscano wrote:
Fixes commit 42cb77be8c29de57f2f523688ea375762715d23f. --- ocaml/tests/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
ACK
diff --git a/ocaml/tests/Makefile.am b/ocaml/tests/Makefile.am index dfb23ff..56519c0 100644 --- a/ocaml/tests/Makefile.am +++ b/ocaml/tests/Makefile.am @@ -100,7 +100,10 @@ endif
TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 OCAMLRUNPARAM=b LOG_COMPILER = $(top_builddir)/run -TESTS = $(tests_bc) $(tests_opt) +TESTS = $(tests_bc) +if HAVE_OCAMLOPT +TESTS += $(tests_opt) +endif
endif HAVE_NBDKIT endif HAVE_OCAML
-- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
On Mon, Sep 23, 2019 at 05:35:09PM +0200, Pino Toscano wrote:
Fixes commit 42cb77be8c29de57f2f523688ea375762715d23f. --- ocaml/tests/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ocaml/tests/Makefile.am b/ocaml/tests/Makefile.am index dfb23ff..56519c0 100644 --- a/ocaml/tests/Makefile.am +++ b/ocaml/tests/Makefile.am @@ -100,7 +100,10 @@ endif
TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 OCAMLRUNPARAM=b LOG_COMPILER = $(top_builddir)/run -TESTS = $(tests_bc) $(tests_opt) +TESTS = $(tests_bc) +if HAVE_OCAMLOPT +TESTS += $(tests_opt) +endif
endif HAVE_NBDKIT endif HAVE_OCAML
Looks good, ACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
participants (3)
-
Eric Blake -
Pino Toscano -
Richard W.M. Jones