search for: have_ocaml_pkg_ounit

Not actually useful, as TESTS defines the tests, and it breaks when oUnit is not available (as it tries to build an oUnit-based unit test). --- mllib/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 0b43684..e363f27 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -132,9 +132,6 @@ libdir.ml: Makefile # Tests.

...llib/common_gettext.ml]) + + AC_CHECK_OCAML_PKG(oUnit) ]) AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_oUnit" != "xno"]) AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], -- 1.9.3

v1 was here: https://www.redhat.com/archives/libguestfs/2017-October/msg00183.html v2: - Adds back the Debian test, but simplified. - Adds tests on Fedora & Debian. Rich.

...b4da0f 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -86,9 +86,13 @@ OCAMLPACKAGES = \ -I $(top_builddir)/src/.libs \ -I $(top_builddir)/gnulib/lib/.libs \ -I $(top_builddir)/ocaml +OCAMLPACKAGES_TESTS = if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif +if HAVE_OCAML_PKG_OUNIT +OCAMLPACKAGES_TESTS += -package oUnit +endif OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) @@ -115,6 +119,7 @@ dummy_LINK = \ if HAVE_OCAMLOPT .ml.cmx: $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@ + endif # This OCaml module has to be generated by make (config...

On Wednesday, 19 July 2017 16:33:39 CEST Richard W.M. Jones wrote: > On Wed, Jul 19, 2017 at 02:29:33PM +0200, Pino Toscano wrote: > > On Wednesday, 19 July 2017 14:21:51 CEST Richard W.M. Jones wrote: > > > On Wed, Jul 19, 2017 at 12:57:08PM +0200, Pino Toscano wrote: > > > > Would it be possible to use oUnit too? > > > > > > I'm not clear on

...+ "examples.virt-builder" >:: test_builder; + ] let () = - Printf.fprintf stderr "\n" + run_test_tt_main suite diff --git a/mllib/Makefile.am b/mllib/Makefile.am index d5faf19..0b43684 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -165,6 +165,8 @@ if HAVE_OCAML_PKG_OUNIT TESTS += common_utils_tests JSON_tests endif +CLEANFILES += oUnit-* + check-valgrind: $(MAKE) VG="$(top_builddir)/run @VG@" check diff --git a/mllib/common_utils_tests.ml b/mllib/common_utils_tests.ml index 283e9a1..a06476b 100644 --- a/mllib/common_utils_tests.ml +++ b/mllib/com...

On Thu, Aug 03, 2017 at 06:08:24PM +0200, Pino Toscano wrote: > But I guess I have no chance to change the current patch (even adding > a test using asserts, instead of oUnit, for which I still did not get > a reason why a new test using it would be unacceptable), so ... Fewer dependencies make the code easier for others to consume, and that's especially true when (like oUnit) those

...\ utils.mli \ v2v.mli \ vCenter.mli \ + var_expander.mli \ windows.mli \ windows_virtio.mli @@ -106,6 +107,7 @@ SOURCES_ML = \ types.ml \ uefi.ml \ utils.ml \ + var_expander.ml \ python_script.ml \ name_from_disk.ml \ vCenter.ml \ @@ -442,7 +444,7 @@ TESTS += \ endif if HAVE_OCAML_PKG_OUNIT -TESTS += v2v_unit_tests +TESTS += v2v_unit_tests var_expander_tests endif if ENABLE_APPLIANCE @@ -651,7 +653,7 @@ EXTRA_DIST += \ # Unit tests. check_PROGRAMS = if HAVE_OCAML_PKG_OUNIT -check_PROGRAMS += v2v_unit_tests +check_PROGRAMS += v2v_unit_tests var_expander_tests endif v2v_unit_...

...@ -1165,7 +1158,7 @@ AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], AM_CONDITIONAL([HAVE_OCAML_PKG_LIBVIRT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_libvirt" != "xno"]) AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], - [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_oUnit" != "xno"]) + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" &&...

...> -- I don't think this is spurious (although it doesn't do very much). Automake wants us to list all built scripts in a check_SCRIPTS rule, of which this is one. See section 9.1 Executable Scripts in the automake info file. It probably does need to be changed to: check_SCRIPTS = if HAVE_OCAML_PKG_OUNIT check_SCRIPTS += common_utils_tests endif Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual ma...

...OUnit2. Otherwise, > I'd like to know what are the reasons against using something that > already discussed in the past, approved, and established. My reasoning is that oUnit2 is optional. If packagers don't have it and they run the tests then the oUnit2 tests are skipped (see ‘if HAVE_OCAML_PKG_OUNIT’ in the makefiles). A simpler test framework which didn't use an external dependency wouldn't be skipped. 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...

...t "x$OCAMLC" != "xno"],[ ]) AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAML_PKG_gettext" != "xno"]) -AM_CONDITIONAL([HAVE_OCAML_PKG_LIBVIRT], - [test "x$OCAML_PKG_libvirt" != "xno"]) AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) -- 2.17.2

...op_srcdir)/ocaml-link.sh +JSON_tests_LINK = \ + $(top_srcdir)/ocaml-link.sh -- \ + $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \ + $(JSON_tests_THEOBJECTS) -o $@ + TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = +check_PROGRAMS = if HAVE_OCAML_PKG_OUNIT +check_PROGRAMS += common_utils_tests JSON_tests TESTS += common_utils_tests JSON_tests endif diff --git a/mllib/dummy.c b/mllib/dummy.c new file mode 100644 index 0000000..ebab619 --- /dev/null +++ b/mllib/dummy.c @@ -0,0 +1,2 @@ +/* Dummy source, to be used for OCaml-based tools with no C sou...

...critical importance that we need to do that right now, or even soon. However adding more oUnit tests means adding more tests which can't be run unless you have oUnit installed. > > If packagers don't have it and they run the tests then the oUnit2 > > tests are skipped (see ‘if HAVE_OCAML_PKG_OUNIT’ in the makefiles). > > Packagers rarely run our unit tests, since they make the build times > much longer, even on fast builders. (Not to mention that sometimes > they use VMs, and thus this adds more issues to that.) Even in Fedora > the general test suite is disabled, only `mak...

...TESTS = \ + test-v2v-copy-to-local.sh \ test-v2v-docs.sh \ test-v2v-python-syntax.sh \ test-v2v-i-ova-bad-sha1.sh \ @@ -442,29 +443,19 @@ TESTS = \ test-v2v-o-vdsm-oo-query.sh \ test-v2v-bad-networks-and-bridges.sh -if HAVE_LIBVIRT -TESTS += \ - test-v2v-copy-to-local.sh -endif - if HAVE_OCAML_PKG_OUNIT TESTS += v2v_unit_tests var_expander_tests endif if ENABLE_APPLIANCE -TESTS += \ - test-v2v-i-ova.sh \ - test-v2v-i-disk.sh \ - test-v2v-machine-readable.sh \ - test-v2v-virtio-win-iso.sh \ - test-v2v-windows-conversion.sh - -if HAVE_LIBVIRT TESTS += \ test-v2v-cdrom.sh \ test-v2v-floppy....

...more > tests which can't be run unless you have oUnit installed. As I already wrote, the availability of oUnit is not a problem at all, and neither is its weight. > > > If packagers don't have it and they run the tests then the oUnit2 > > > tests are skipped (see ‘if HAVE_OCAML_PKG_OUNIT’ in the makefiles). > > > > Packagers rarely run our unit tests, since they make the build times > > much longer, even on fast builders. (Not to mention that sometimes > > they use VMs, and thus this adds more issues to that.) Even in Fedora > > the general test sui...

...le.am index 4b77ba2..18c2007 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -291,7 +291,8 @@ TESTS = \ test-v2v-i-ova-formats.sh \ test-v2v-i-ova-gz.sh \ test-v2v-i-ova-two-disks.sh \ - test-v2v-copy-to-local.sh + test-v2v-copy-to-local.sh \ + test-v2v-bad-networks-and-bridges.sh if HAVE_OCAML_PKG_OUNIT TESTS += v2v_unit_tests diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 35d18b6..befd8a0 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -26,12 +26,18 @@ open Common_utils open Types open Utils +module NetTypeAndName = struct + type t = Types.vnet_type * string option + let compare =...

...$(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \ + $(index_parser_tests_THEOBJECTS) -o $@ + TESTS = \ test-docs.sh \ test-virt-builder-list.sh \ @@ -249,8 +281,8 @@ if ENABLE_APPLIANCE TESTS += test-virt-builder.sh endif ENABLE_APPLIANCE if HAVE_OCAML_PKG_OUNIT -check_PROGRAMS += yajl_tests -TESTS += yajl_tests +check_PROGRAMS += yajl_tests index_parser_tests +TESTS += yajl_tests index_parser_tests endif check-valgrind: diff --git a/builder/index.mli b/builder/index.mli index ff5ec4a35..6202d636e 100644 --- a/builder/index.mli +++ b/builder/index.mli...

...AL([HAVE_OCAML_PKG_LIBVIRT], - [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_libvirt" != "xno"]) + [test "x$OCAML_PKG_libvirt" != "xno"]) AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], - [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) + [test "x$OCAML_PKG_oUnit" != &quo...

....cmo + $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ + mlguestfs.cma -linkpkg $^ -cclib '$(LIBTINFO_LIBS)' -custom -o $@ endif TESTS_ENVIRONMENT = $(top_builddir)/run --test @@ -151,7 +162,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = if HAVE_OCAML_PKG_OUNIT -TESTS += common_utils_tests +TESTS += common_utils_tests JSON_tests endif check-valgrind: diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 4ebcc09..6a0acdd 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -29,6 +29,7 @@ customize/ssh_key.ml customize/timezone.ml customize/urandom.ml ml...