search for: test_progs_all

...ple of seconds on the build time. --- ocaml/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index e781363..a535b43 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -142,9 +142,9 @@ endif TESTS = run-bindtests $(test_progs_all) -noinst_DATA += bindtests.bc $(test_progs_all) +check_DATA = bindtests.bc $(test_progs_all) if HAVE_OCAMLOPT -noinst_DATA += bindtests.opt +check_DATA += bindtests.opt endif %.bc: %.cmo mlguestfs.cma @@ -204,6 +204,6 @@ install-data-hook: rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...socaml.a guestfs.cmx $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs - touch $@ libguestfsocaml_a_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ @@ -121,11 +121,17 @@ test_progs_opt += \ t/guestfs_430_progress_messages.opt endif -test_progs_all = $(test_progs_bc) $(test_progs_opt) +test_progs_all = $(test_progs_bc) +if HAVE_OCAMLOPT +test_progs_all += $(test_progs_opt) +endif TESTS = run-bindtests $(test_progs_all) -noinst_DATA += bindtests.bc bindtests.opt $(test_progs_all) +noinst_DATA += bindtests.bc $(test_progs_all) +if HAVE_OCA...

...src/.libs -lguestfs +if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs +endif touch $@ libguestfsocaml_a_CPPFLAGS = \ @@ -121,11 +138,16 @@ test_progs_opt += \ t/guestfs_430_progress_messages.opt endif -test_progs_all = $(test_progs_bc) $(test_progs_opt) +test_progs_all = $(test_progs_bc) +bindtests_all = bindtests.bc +if HAVE_OCAMLOPT +test_progs_all += $(test_progs_opt) +bindtests_all += bindtests.opt +endif TESTS = run-bindtests $(test_progs_all) -noinst_DATA += bindtests.bc bindtests.opt $(test_progs_al...

Since we switched to using parallel tests, our valgrind tests would definitely have found leaks in the /usr/bin/env program if it had any. Not so much in some of our own programs. Let's fix that. Rich.

...d..b0f2900f2e 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -26,7 +26,6 @@ generator_built = \ EXTRA_DIST = \ $(generator_built) \ - .depend \ guestfs-c.c guestfs-c.h \ html/.gitignore \ META.in \ @@ -171,7 +170,7 @@ check-valgrind: $(MAKE) VG="@VG@" TESTS="$(test_progs_all)" check # Dependencies. -.depend: *.mli *.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/resize/Makefile.am b/resize/Makefile.am index e599e1142f..847fb313a7 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -144,7 +1...

...e2..b0f2900f2 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -26,7 +26,6 @@ generator_built = \ EXTRA_DIST = \ $(generator_built) \ - .depend \ guestfs-c.c guestfs-c.h \ html/.gitignore \ META.in \ @@ -171,7 +170,7 @@ check-valgrind: $(MAKE) VG="@VG@" TESTS="$(test_progs_all)" check # Dependencies. -.depend: *.mli *.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/resize/Makefile.am b/resize/Makefile.am index e599e1142..847fb313a 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -144,7 +144...

...TRA_DIST = \ run-bindtests \ t/*.ml -CLEANFILES = *.annot *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so +CLEANFILES += *.so CLEANFILES += t/*.annot t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so if HAVE_OCAML @@ -169,8 +169,6 @@ endif check-valgrind: $(MAKE) VG="@VG@" TESTS="$(test_progs_all)" check -CLEANFILES += bindtests.tmp - # Dependencies. %.cmi: %.mli $(guestfs_am_v_ocamlc)$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $@ diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 5f4177c..29c9466 100644 --- a/ocaml/examples/Makefile.am ++...

I should probably start by saying this patch series isn't ready for review yet. This patch series adds a test harness to libguestfs. It allows us to run the tests outside the ordinary 'make check' path in the build tree. In particular, you can use this to run tests when libguestfs has been installed. 'make check' and the other 'make check-*' rules still work. The

For v6: This is mainly just a rebase, but I have also added tests in the ocaml/ language bindings directory, and for all the OCaml-written virt tools. Rich.

v7: The only changes since v6 are those suggested by Pino in the review of v5.

This is a more complete patch to add the test harness. The only parts missing now are the language bindings (except OCaml). The language bindings need a bit more thought. At the moment most language binding tests are done through some sort of shell script like perl/run-perl-tests which either runs each test itself or uses some language-specific machinary to run each test. The problem with that

Since v2: - Add perl tests. - Reworked and fixed the tests for virt-builder. - Some further minor bug fixes.

Since v3: - A large number of fixes, especially for running the tests on installed libguestfs. - Fixed EXTRA_DIST rules throughout. - Extra patch 17/17 which is a tidy-up of the generated XML listing guests. Rich.