mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Remove use of oUnit

Browse Source 
This added no value over just running ordinary tests.  This also
removes a complicated OCaml dependency.
This commit is contained in:
Richard W.M. Jones
2025-03-22 12:41:39 +00:00
parent 2f0fa0fd23
commit 85c8445e1e
4 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common

Submodule common updated: 3cb34f6b68...64f6ee85f8

3
common-rules.mk
View File

@@ -36,9 +36,6 @@ CLEANFILES += *.cmi *.cmo *.cma *.cmx *.cmxa dll*.so *.a
# OCaml -annot files (used for displaying types in some IDEs). # OCaml -annot files (used for displaying types in some IDEs).
CLEANFILES += *.annot CLEANFILES += *.annot
# OCaml oUnit generated files.
CLEANFILES += oUnit-*.cache oUnit-*.log
# Manual pages - these are all generated from *.pod, so the # Manual pages - these are all generated from *.pod, so the
# pages themselves should all be removed by 'make clean'. # pages themselves should all be removed by 'make clean'.
CLEANFILES += *.1 *.3 *.5 *.8 CLEANFILES += *.1 *.3 *.5 *.8

4
docs/guestfs-building.pod
View File

@@ -295,10 +295,6 @@ Optional. Used by L<virt-log(1)> to parse Windows Event Log files.
Optional. For localizing OCaml virt tools. Optional. For localizing OCaml virt tools.
=item ocaml-ounit E<ge> 2.0.0
Optional. For testing the common OCaml modules.
=item Perl C<Module::Build> E<ge> 0.19 =item Perl C<Module::Build> E<ge> 0.19
=item Perl C<Test::More> =item Perl C<Test::More>

9
m4/guestfs-ocaml.m4
View File

@@ -181,15 +181,6 @@ if test "x$enable_daemon" = "xyes"; then
fi fi
fi fi
# oUnit is optional, used by some tests in common/mlstdutils (that we
# should replace with regular tests one day). If used, oUnit >= 2 is
# required.
if test "x$OCAML_PKG_ounit2" != "xno"; then
AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2])
fi
AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT],
[test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"])
dnl Flags we want to pass to every OCaml compiler call. dnl Flags we want to pass to every OCaml compiler call.
OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6" OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
AC_SUBST([OCAML_WARN_ERROR]) AC_SUBST([OCAML_WARN_ERROR])