search for: check_scripts

...le (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. -check_SCRIPTS = \ - common_utils_tests - if HAVE_OCAMLOPT common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx -- 2.1.0

...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. > > -check_SCRIPTS = \ > - common_utils_tests > - > if HAVE_OCAMLOPT > common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) > common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx > -- I don't think this is spurious (although it doesn't do...

...this. This is probably also the case for $FLAC__TEST_WITH_VALGRIND While going trough test/Makefile, I found this # This is the full test suite, but only works correctly in-tree. # In particular test_grabbag.sh, test_flac.sh and test_metaflac.sh will not # run correctly out-of-tree. fullcheck: $(check_SCRIPTS) ./test_libFLAC.sh ./test_libFLAC++.sh ./test_grabbag.sh [...]

...x # NB: libnbdkitocaml is not plugin. It's a library that you have to diff --git a/tests/Makefile.am b/tests/Makefile.am index 4e16fa9..94f3d43 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -517,7 +517,9 @@ test_ocaml_CFLAGS = \ test_ocaml_LDADD = libtest.la $(LIBGUESTFS_LIBS) check_SCRIPTS += test-ocaml-plugin.so -test-ocaml-plugin.so: test_ocaml_plugin.ml ../plugins/ocaml/libnbdkitocaml.la ../plugins/ocaml/NBDKit.cmi ../plugins/ocaml/NBDKit.cmx +test_ocaml_plugin.cmx: test_ocaml_plugin.ml + $(OCAMLOPT) $(OCAMLOPTFLAGS) -I ../plugins/ocaml -c $< -o $@ +test-ocaml-plugin.so: test_o...

On Mon, May 11, 2015 at 07:22:58PM +0200, Pino Toscano wrote: > On Monday 11 May 2015 11:11:50 Richard W.M. Jones wrote: > > OUnit2 has an OUnit (v1) compatibility module. Unfortunately it > > is rather gravely broken: > > https://forge.ocamlcore.org/tracker/?func=detail&aid=1392&group_id=162&atid=730 > > > > Since there is no new release fixing this,

...po/POTFILES | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 mllib/dummy.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am index c7967b8..272c981 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -141,36 +141,54 @@ libdir.ml: Makefile # Tests. -check_SCRIPTS = \ - common_utils_tests - +common_utils_tests_SOURCES = dummy.c +common_utils_tests_BOBJECTS = \ + config.cmo \ + common_gettext.cmo \ + common_utils.cmo \ + common_utils_tests.cmo +common_utils_tests_XOBJECTS = $(common_utils_tests_BOBJECTS:.cmo=.cmx) + +JSON_tests_SOURCES = dummy.c +JSON_tests_B...

...\ diff --git a/tests/Makefile.am b/tests/Makefile.am index c2d473a..daf1d2a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,6 +71,12 @@ check-valgrind: # Basic server command line and start-up tests. +check_PROGRAMS = +check_DATA = +check_SCRIPTS = +check_LTLIBRARIES = +noinst_LTLIBRARIES = + TESTS = \ test-help.sh \ test-help-plugin.sh \ @@ -86,24 +92,34 @@ TESTS = \ test-ipv4.sh \ test-socket-activation -check_PROGRAMS = \ +check_PROGRAMS += \ test-socket-activation test_socket_activation_SOURCES = test-socket-activation.c...

This version uses Eric's subtype suggestion: https://bugzilla.redhat.com/show_bug.cgi?id=1418328#c6 Rich.

This version uses a static initializer function (https://bugzilla.redhat.com/show_bug.cgi?id=1418328#c9). Rich.

...ns(-) create mode 100755 capitests/check-noexec-stack.pl diff --git a/capitests/Makefile.am b/capitests/Makefile.am index 71928ec..08466ac 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -22,13 +22,15 @@ EXTRA_DIST = \ # in the generator. check_PROGRAMS = tests test-command +check_SCRIPTS = check-noexec-stack.pl tests_SOURCES = tests.c tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -Wall tests_LDADD = $(top_builddir)/src/libguestfs.la -TESTS = tests +TESTS = check-noexec-stack.pl tests TESTS_ENVIRONMENT = \ + NOEXEC_CHECK=$(top_builddir)/src/.libs/libguestfs.so \...

It will be used for the OCaml unit tests. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index e0fb481..e360bbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1120,6 +1120,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ ]) OCAML_PKG_gettext=no +OCAML_PKG_oUnit=no AS_IF([test "x$OCAMLC" != "xno"],[ #

...AMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu @@ -154,11 +154,11 @@ check_SCRIPTS = common_utils_tests if HAVE_OCAMLOPT common_utils_tests: common_gettext.cmx tty-c.o tTY.cmx common_utils.cmx common_utils_tests.cmx $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ - mlguestfs.cmxa -linkpkg $^ -cclib -ltinfo -o $@ + mlguestfs.cmxa -linkpkg $^ -cclib $(LIBCURSES_LIBS) -o $@ else...

...Unit +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 (configure will put @@ -130,18 +135,24 @@ check_SCRIPTS = \ common_utils_tests if HAVE_OCAMLOPT +common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx - $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) \ + $(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGE...

...,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu @@ -154,11 +154,11 @@ check_SCRIPTS = common_utils_tests if HAVE_OCAMLOPT common_utils_tests: common_gettext.cmx tty-c.o tTY.cmx common_utils.cmx common_utils_tests.cmx $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ - mlguestfs.cmxa -linkpkg $^ -cclib -lncurses -o $@ + mlguestfs.cmxa -linkpkg $^ -cclib -ltinfo -o $@ else common_u...

...on, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + *) + +(* Please read generator/README first. *) + +open Printf + +open Types +open Utils +open Pr +open Docstrings + +let defaults = { + check = []; check_fast = []; check_slow = []; check_local_guests = []; + check_data = []; check_scripts = []; check_programs = []; +} + +(* The tests in each subdirectory. *) +let tests = [ + "inspector", { + defaults with + check = [ + "test-virt-inspector.sh"; + ]; + check_fast = [ + "test-xmllint.sh"; + ]; + check_local_guest...

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#)

...on, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + *) + +(* Please read generator/README first. *) + +open Printf + +open Types +open Utils +open Pr +open Docstrings + +let defaults = { + check = []; check_fast = []; check_slow = []; check_local_guests = []; + check_data = []; check_scripts = []; check_programs = []; +} + +(* The tests in each subdirectory. *) +let tests = [ + "inspector", { + defaults with + check = [ + "test-virt-inspector.sh"; + ]; + check_fast = [ + "test-xmllint.sh"; + ]; + check_local_guest...

Make use of Unix.isatty instead of our TTY.isatty_stdout, as the supported OCaml provides the former already. --- mllib/common_utils.ml | 10 +++++----- mllib/progress.ml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 295981c..9fcd8dd 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -207,15 +207,15

...AGS) \ -o $@ +else + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + mlguestfs.cma -linkpkg $^ \ + -cclib '$(OCAMLCLIBS)' \ + -custom \ + $(OCAML_GCOV_LDFLAGS) \ + -o $@ +endif .mli.cmi: $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@ @@ -153,9 +169,15 @@ DEFAULT_INCLUDES = \ check_SCRIPTS = common_utils_tests +if HAVE_OCAMLOPT common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ -cclib -lncurses -o $@ +else +common_utils_tests: common_gettext.cmo common_utils.cmo common_utils_tests...

...+test_socket_activation_CFLAGS = $(WARNINGS_CFLAGS) # In-depth tests need libguestfs, since that is a convenient way to # drive qemu. @@ -103,7 +110,6 @@ check_LTLIBRARIES = libtest.la libtest_la_SOURCES = test.c test.h libtest_la_CFLAGS = $(WARNINGS_CFLAGS) -check_PROGRAMS = check_DATA = check_SCRIPTS = diff --git a/tests/test-socket-activation.c b/tests/test-socket-activation.c new file mode 100644 index 0000000..5ecdde1 --- /dev/null +++ b/tests/test-socket-activation.c @@ -0,0 +1,226 @@ +/* nbdkit + * Copyright (C) 2017 Red Hat Inc. + * All rights reserved. + * + * Redistribution and use in...