diff --git a/0001-Make-const-the-return-value-of-caml_named_value.patch b/0001-Make-const-the-return-value-of-caml_named_value.patch new file mode 100644 index 0000000..c8b7aee --- /dev/null +++ b/0001-Make-const-the-return-value-of-caml_named_value.patch @@ -0,0 +1,38 @@ +From 75b13978f85b32c7a121aa289d8ebf41ba14ee5a Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Thu, 5 Sep 2019 09:57:09 +0200 +Subject: [PATCH] Make const the return value of caml_named_value() + +With OCaml >= 4.09 caml_named_value() returns a const value *, so keep +the constness to build also in this case. + +Signed-off-by: Pino Toscano +--- + libvirt/libvirt_c_oneoffs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c +index 6f56f10..e23c0db 100644 +--- a/libvirt/libvirt_c_oneoffs.c ++++ b/libvirt/libvirt_c_oneoffs.c +@@ -1207,7 +1207,7 @@ ocaml_libvirt_event_run_default_impl (value unitv) + #define DOMAIN_CALLBACK_BEGIN(NAME) \ + value connv, domv, callback_id, result; \ + connv = domv = callback_id = result = Val_int(0); \ +- static value *callback = NULL; \ ++ static const value *callback = NULL; \ + caml_leave_blocking_section(); \ + if (callback == NULL) \ + callback = caml_named_value(NAME); \ +@@ -1433,7 +1433,7 @@ timeout_callback(int timer, void *opaque) + { + value callback_id, result; + callback_id = result = Val_int(0); +- static value *callback = NULL; ++ static const value *callback = NULL; + caml_leave_blocking_section(); + if (callback == NULL) + callback = caml_named_value("Libvirt.timeout_callback"); +-- +2.23.0 + diff --git a/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch b/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch new file mode 100644 index 0000000..f3b93af --- /dev/null +++ b/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch @@ -0,0 +1,74 @@ +From 29709872404fad20a9822c43a831f30b7b09f34a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 19 Jan 2020 12:58:17 +0000 +Subject: [PATCH 1/3] block_peek, memory_peek: Use bytes for return buffer. + +Strings are immutable in modern OCaml. +--- + libvirt/libvirt.ml | 4 ++-- + libvirt/libvirt.mli | 4 ++-- + libvirt/libvirt_c_oneoffs.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml +index 7f9d0e4..bdb9460 100644 +--- a/libvirt/libvirt.ml ++++ b/libvirt/libvirt.ml +@@ -731,8 +731,8 @@ struct + external migrate : [>`W] t -> [>`W] Connect.t -> migrate_flag list -> ?dname:string -> ?uri:string -> ?bandwidth:int -> unit -> rw t = "ocaml_libvirt_domain_migrate_bytecode" "ocaml_libvirt_domain_migrate_native" + external block_stats : [>`R] t -> string -> block_stats = "ocaml_libvirt_domain_block_stats" + external interface_stats : [>`R] t -> string -> interface_stats = "ocaml_libvirt_domain_interface_stats" +- external block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" +- external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" ++ external block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" ++ external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" + + external get_all_domain_stats : [>`R] Connect.t -> stats_type list -> get_all_domain_stats_flag list -> domain_stats_record array = "ocaml_libvirt_domain_get_all_domain_stats" + +diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli +index 0d74199..7900392 100644 +--- a/libvirt/libvirt.mli ++++ b/libvirt/libvirt.mli +@@ -708,7 +708,7 @@ sig + val interface_stats : [>`R] t -> string -> interface_stats + (** Returns network interface stats. *) + +- val block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit ++ val block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit + (** [block_peek dom path offset size buf boff] reads [size] bytes at + [offset] in the domain's [path] block device. + +@@ -717,7 +717,7 @@ sig + + See also {!max_peek}. *) + val memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> +- string -> int -> unit ++ bytes -> int -> unit + (** [memory_peek dom Virtual offset size] reads [size] bytes + at [offset] in the domain's virtual memory. + +diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c +index 40384e8..8468c73 100644 +--- a/libvirt/libvirt_c_oneoffs.c ++++ b/libvirt/libvirt_c_oneoffs.c +@@ -1057,7 +1057,7 @@ ocaml_libvirt_domain_block_peek_native (value domv, value pathv, value offsetv, + const char *path = String_val (pathv); + unsigned long long offset = Int64_val (offsetv); + size_t size = Int_val (sizev); +- char *buffer = String_val (bufferv); ++ unsigned char *buffer = Bytes_val (bufferv); + int boff = Int_val (boffv); + int r; + +@@ -1089,7 +1089,7 @@ ocaml_libvirt_domain_memory_peek_native (value domv, value flagsv, value offsetv + int flags = 0; + unsigned long long offset = Int64_val (offsetv); + size_t size = Int_val (sizev); +- char *buffer = String_val (bufferv); ++ unsigned char *buffer = Bytes_val (bufferv); + int boff = Int_val (boffv); + int r; + +-- +2.24.1 + diff --git a/0002-String_val-returns-const-char-in-OCaml-4.10.patch b/0002-String_val-returns-const-char-in-OCaml-4.10.patch new file mode 100644 index 0000000..4f547cb --- /dev/null +++ b/0002-String_val-returns-const-char-in-OCaml-4.10.patch @@ -0,0 +1,113 @@ +From 3705b9bdcd04dc86474c62e1c8dd8759669842bc Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 19 Jan 2020 12:59:09 +0000 +Subject: [PATCH 2/3] String_val returns const char * in OCaml 4.10. + +This should be compatible with earlier versions of OCaml +too since we are just assigning a char * to a const char *. +--- + libvirt/generator.pl | 14 +++++++------- + libvirt/libvirt_c_oneoffs.c | 6 +++--- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/libvirt/generator.pl b/libvirt/generator.pl +index ac3dd65..aff371b 100755 +--- a/libvirt/generator.pl ++++ b/libvirt/generator.pl +@@ -593,7 +593,7 @@ sub gen_c_code + } elsif ($sig =~ /^(\w+), string : unit$/) { + "\ + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + int r; + + NONBLOCKING (r = $c_name ($1, str)); +@@ -605,7 +605,7 @@ sub gen_c_code + "\ + CAMLlocal1 (rv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + int r; + + NONBLOCKING (r = $c_name ($1, str, 0)); +@@ -618,7 +618,7 @@ sub gen_c_code + "\ + CAMLlocal1 (rv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + $c_ret_type r; + + NONBLOCKING (r = $c_name ($1, str)); +@@ -633,7 +633,7 @@ sub gen_c_code + "\ + CAMLlocal1 (rv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + $c_ret_type r; + + NONBLOCKING (r = $c_name ($1, str, 0)); +@@ -648,7 +648,7 @@ sub gen_c_code + "\ + CAMLlocal1 (rv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + unsigned int u = Int_val (uv); + $c_ret_type r; + +@@ -735,7 +735,7 @@ sub gen_c_code + "\ + CAMLlocal2 (rv, connv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + $c_ret_type r; + + NONBLOCKING (r = $c_name ($1, str)); +@@ -751,7 +751,7 @@ sub gen_c_code + "\ + CAMLlocal2 (rv, connv); + " . gen_unpack_args ($1) . " +- char *str = String_val (strv); ++ const char *str = String_val (strv); + $c_ret_type r; + + NONBLOCKING (r = $c_name ($1, str, 0)); +diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c +index 8468c73..fc2ac13 100644 +--- a/libvirt/libvirt_c_oneoffs.c ++++ b/libvirt/libvirt_c_oneoffs.c +@@ -601,7 +601,7 @@ ocaml_libvirt_domain_set_scheduler_parameters (value domv, value paramsv) + int nparams = Wosize_val (paramsv); + virSchedParameterPtr params; + int r, i; +- char *name; ++ const char *name; + + params = malloc (sizeof (*params) * nparams); + if (params == NULL) +@@ -1005,7 +1005,7 @@ ocaml_libvirt_domain_block_stats (value domv, value pathv) + CAMLparam2 (domv, pathv); + CAMLlocal2 (rv,v); + virDomainPtr dom = Domain_val (domv); +- char *path = String_val (pathv); ++ const char *path = String_val (pathv); + struct _virDomainBlockStats stats; + int r; + +@@ -1028,7 +1028,7 @@ ocaml_libvirt_domain_interface_stats (value domv, value pathv) + CAMLparam2 (domv, pathv); + CAMLlocal2 (rv,v); + virDomainPtr dom = Domain_val (domv); +- char *path = String_val (pathv); ++ const char *path = String_val (pathv); + struct _virDomainInterfaceStats stats; + int r; + +-- +2.24.1 + diff --git a/0003-Don-t-try-to-memcpy-into-a-String_val.patch b/0003-Don-t-try-to-memcpy-into-a-String_val.patch new file mode 100644 index 0000000..720787f --- /dev/null +++ b/0003-Don-t-try-to-memcpy-into-a-String_val.patch @@ -0,0 +1,68 @@ +From 3d3d6af425d369200a7a62a127adf640d94a38a3 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 19 Jan 2020 13:02:16 +0000 +Subject: [PATCH 3/3] Don't try to memcpy into a String_val. + +In OCaml 4.10 String_val returns const char *, so we cannot use it as +the destination for memcpy. Use Bytes_val instead. +--- + libvirt/generator.pl | 2 +- + libvirt/libvirt_c_oneoffs.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libvirt/generator.pl b/libvirt/generator.pl +index aff371b..463a19b 100755 +--- a/libvirt/generator.pl ++++ b/libvirt/generator.pl +@@ -440,7 +440,7 @@ sub gen_c_code + + /* UUIDs are byte arrays with a fixed length. */ + rv = caml_alloc_string (VIR_UUID_BUFLEN); +- memcpy (String_val (rv), uuid, VIR_UUID_BUFLEN); ++ memcpy (Bytes_val (rv), uuid, VIR_UUID_BUFLEN); + CAMLreturn (rv); + " + } elsif ($sig =~ /^(\w+) : uuid string$/) { +diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c +index fc2ac13..e8472b7 100644 +--- a/libvirt/libvirt_c_oneoffs.c ++++ b/libvirt/libvirt_c_oneoffs.c +@@ -394,7 +394,7 @@ ocaml_libvirt_connect_call_auth_default_callback (value listv) + elemv = caml_alloc (2, 0); + if (cred->result != NULL && cred->resultlen > 0) { + v = caml_alloc_string (cred->resultlen); +- memcpy (String_val (v), cred->result, cred->resultlen); ++ memcpy (Bytes_val (v), cred->result, cred->resultlen); + optv = caml_alloc (1, 0); + Store_field (optv, 0, v); + } else +@@ -715,7 +715,7 @@ ocaml_libvirt_domain_get_vcpus (value domv, value maxinfov, value maplenv) + + /* Copy the bitmap. */ + strv = caml_alloc_string (maxinfo * maplen); +- memcpy (String_val (strv), cpumaps, maxinfo * maplen); ++ memcpy (Bytes_val (strv), cpumaps, maxinfo * maplen); + + /* Allocate the tuple and return it. */ + rv = caml_alloc_tuple (3); +@@ -900,7 +900,7 @@ ocaml_libvirt_domain_get_all_domain_stats (value connv, + */ + v = caml_alloc_string (VIR_UUID_BUFLEN); + virDomainGetUUID (rstats[i]->dom, uuid); +- memcpy (String_val (v), uuid, VIR_UUID_BUFLEN); ++ memcpy (Bytes_val (v), uuid, VIR_UUID_BUFLEN); + Store_field (dsv, 0, v); + + tpv = caml_alloc (rstats[i]->nparams, 0); /* typed_param array */ +@@ -1646,7 +1646,7 @@ ocaml_libvirt_secret_get_value (value secv) + CHECK_ERROR (secval == NULL, "virSecretGetValue"); + + rv = caml_alloc_string (size); +- memcpy (String_val (rv), secval, size); ++ memcpy (Bytes_val (rv), secval, size); + free (secval); + + CAMLreturn (rv); +-- +2.24.1 + diff --git a/gating.yaml b/gating.yaml deleted file mode 100755 index 2c7ed80..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 770ea0b..f469de9 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,27 +1,29 @@ -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} - Name: ocaml-libvirt -Version: 0.6.1.7 -Release: 17%{?dist} +Version: 0.6.1.5 +Release: 15%{?dist} Summary: OCaml binding for libvirt -License: LGPL-2.1-or-later +License: LGPLv2+ -URL: https://ocaml.libvirt.org/ -Source0: https://download.libvirt.org/ocaml/%{name}-%{version}.tar.gz +URL: http://libvirt.org/ocaml/ +Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz -BuildRequires: make +# Fixes build with OCaml >= 4.09. +# Upstream commit 75b13978f85b32c7a121aa289d8ebf41ba14ee5a. +Patch1: 0001-Make-const-the-return-value-of-caml_named_value.patch + +# Fixes for OCaml 4.10, sent upstream 2020-01-19. +Patch2: 0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch +Patch3: 0002-String_val-returns-const-char-in-OCaml-4.10.patch +Patch4: 0003-Don-t-try-to-memcpy-into-a-String_val.patch + +BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-rpm-macros BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl-interpreter - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +BuildRequires: gawk %description @@ -30,7 +32,7 @@ OCaml binding for libvirt. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel @@ -42,19 +44,13 @@ developing applications that use %{name}. %setup -q %autopatch -p1 -# Fix detection of ocamlopt and ocamldoc -# https://gitlab.com/libvirt/libvirt-ocaml/-/merge_requests/27 -sed -i '/AM_CONDITIONAL/s/"x"/"xno"/' configure.ac - -# Regenerate the configure script -autoreconf -fi -I m4 . - %build -# Parallel builds do not work. -unset MAKEFLAGS %configure -make +make all doc +%ifarch %{ocaml_native_compiler} +make opt +%endif %install @@ -63,111 +59,37 @@ export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} -make install -%ocaml_files +%ifarch %{ocaml_native_compiler} +make install-opt +%else +make install-byte +%endif -%files -f .ofiles -%doc README -%license COPYING.LIB +%files +%doc COPYING.LIB README ChangeLog +%{_libdir}/ocaml/libvirt +%ifarch %{ocaml_native_compiler} +%exclude %{_libdir}/ocaml/libvirt/*.a +%exclude %{_libdir}/ocaml/libvirt/*.cmxa +%exclude %{_libdir}/ocaml/libvirt/*.cmx +%endif +%exclude %{_libdir}/ocaml/libvirt/*.mli +%{_libdir}/ocaml/stublibs/*.so +%{_libdir}/ocaml/stublibs/*.so.owner -%files devel -f .ofiles-devel -%doc README TODO.libvirt -%license COPYING.LIB +%files devel +%doc COPYING.LIB README TODO.libvirt ChangeLog html/* +%ifarch %{ocaml_native_compiler} +%{_libdir}/ocaml/libvirt/*.a +%{_libdir}/ocaml/libvirt/*.cmxa +%{_libdir}/ocaml/libvirt/*.cmx +%endif +%{_libdir}/ocaml/libvirt/*.mli %changelog -* Mon Oct 13 2025 Richard W.M. Jones - 0.6.1.7-17 -- OCaml 5.4.0 rebuild - -* Thu Jul 24 2025 Fedora Release Engineering - 0.6.1.7-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jul 11 2025 Jerry James - 0.6.1.7-15 -- Rebuild to fix OCaml dependencies - -* Fri Jan 17 2025 Fedora Release Engineering - 0.6.1.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 9 2025 Jerry James - 0.6.1.7-13 -- OCaml 5.3.0 rebuild for Fedora 42 - -* Thu Jul 18 2024 Fedora Release Engineering - 0.6.1.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Richard W.M. Jones - 0.6.1.7-11 -- OCaml 5.2.0 ppc64le fix - -* Wed May 29 2024 Richard W.M. Jones - 0.6.1.7-10 -- OCaml 5.2.0 for Fedora 41 - -* Thu Jan 25 2024 Fedora Release Engineering - 0.6.1.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.6.1.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Richard W.M. Jones - 0.6.1.7-7 -- OCaml 5.1.1 + s390x code gen fix for Fedora 40 - -* Tue Dec 12 2023 Richard W.M. Jones - 0.6.1.7-6 -- OCaml 5.1.1 rebuild for Fedora 40 - -* Thu Oct 05 2023 Richard W.M. Jones - 0.6.1.7-5 -- OCaml 5.1 rebuild for Fedora 40 - -* Thu Jul 20 2023 Fedora Release Engineering - 0.6.1.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Richard W.M. Jones - 0.6.1.7-3 -- OCaml 5.0 rebuild for Fedora 39 - -* Mon Jul 10 2023 Jerry James - 0.6.1.7-2 -- OCaml 5.0.0 rebuild -- New project URL -- Convert License tag to SPDX -- Fix build on bytecode-only architectures -- Use %%license macro -- Use new OCaml macros - -* Mon Feb 13 2023 Richard W.M. Jones - 0.6.1.7-1 -- New upstream version 0.6.1.7 -- Do not try parallel builds. -- Upstream now uses automake. -- Remove ChangeLog file and HTML docs, dropped upstream. - -* Tue Jan 24 2023 Richard W.M. Jones - 0.6.1.6-5 -- Rebuild OCaml packages for F38 - -* Thu Jan 19 2023 Fedora Release Engineering - 0.6.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.6.1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jun 18 2022 Richard W.M. Jones - 0.6.1.6-2 -- OCaml 4.14.0 rebuild - -* Thu Apr 28 2022 Richard W.M. Jones - 0.6.1.6-1 -- New upstream version 0.6.1.6 -- Remove patches which are all upstream. - -* Fri Feb 04 2022 Richard W.M. Jones - 0.6.1.5-20 -- OCaml 4.13.1 rebuild to remove package notes - -* Thu Jan 20 2022 Fedora Release Engineering - 0.6.1.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Oct 04 2021 Richard W.M. Jones - 0.6.1.5-18 -- OCaml 4.13.1 build - -* Thu Jul 22 2021 Fedora Release Engineering - 0.6.1.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 0.6.1.5-16 -- OCaml 4.12.0 build - * Tue Jan 26 2021 Fedora Release Engineering - 0.6.1.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e9a0020..46a2bdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-libvirt-0.6.1.7.tar.gz) = ec4ebb69701b15a0c258e78f0e9eb9b1f2a75a86384392e8622ad7f4c85dfc598d51d95698835a2ea401b5647b3ad325ff820cbb7d0e524551ff07c26a54de2b +SHA512 (ocaml-libvirt-0.6.1.5.tar.gz) = 7862732348932049994d06b5212486984408627c4cf510c6048489e846435e393392241dd342fdc57bc0b077a80aa1efda843547b141e226c9770c21afd4da53 diff --git a/tests/basic-test.sh b/tests/basic-test.sh deleted file mode 100755 index 2b0ad08..0000000 --- a/tests/basic-test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e -set -x - -# Compile trivial libvirt program. -echo 'print_endline Libvirt_version.version' > virttest.ml -ocamlfind ocamlopt -package libvirt virttest.ml -linkpkg -o virttest -./virttest diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100755 index c74ad77..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,14 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - ocaml - - ocaml-findlib - - ocaml-libvirt-devel - - libvirt-devel - tests: - - simple: - dir: . - run: ./basic-test.sh