search for: abs_top_builddir

...st-virt-p2v-pxe.sh b/p2v/test-virt-p2v-pxe.sh index f05cb96..4a42d10 100755 --- a/p2v/test-virt-p2v-pxe.sh +++ b/p2v/test-virt-p2v-pxe.sh @@ -55,18 +55,14 @@ if ! test -f $img; then exit 77 fi -guestsdir="$(cd ../tests/guests && pwd)" -f="$guestsdir/windows.img" +abs_top_builddir="$(cd ..; pwd)" +f="$abs_top_builddir/tests/guests/windows.img" if ! test -f $f; then echo "$0: test skipped because phony Windows image was not created" exit 77 fi -virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools} -if ! test -r $virt_too...

...MLARCHIVE) \ ../mllib/mllib.$(MLARCHIVE) \ ../customize/customize.$(MLARCHIVE) \ $(top_srcdir)/ocaml-link.sh @@ -310,7 +314,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mlstdutils -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mlstdutils -I $(abs_top_builddir)/mlutils -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \ $(SED) 's/ *$$//' |...

On Mon, Oct 05, 2015 at 03:40:01PM +0300, Roman Kagan wrote: > -guestsdir="$(cd ../tests/guests && pwd)" > -f="$guestsdir/windows.img" > +abs_top_builddir="$(cd ..; pwd)" You don't need to define abs_top_builddir, as it should already be defined. However it won't be exported to the test scripts unless you change v2v/Makefile.am: TESTS_ENVIRONMENT to include it, something like this: -TESTS_ENVIRONMENT = $(top_builddir)/run --test...

...n/mlstdutils/mlstdutils.$(MLARCHIVE) \ ../common/mlutils/mlcutils.$(MLARCHIVE) \ ../mllib/mllib.$(MLARCHIVE) \ @@ -311,7 +315,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils -I $(abs_top_builddir)/common/mlpcre -I $...

...akefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mlstdutils -I $(abs_top_builddir)/mlutils -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/cus...

...03c732b56a94596. --- lib/local/libguestfs.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/local/libguestfs.pc.in b/lib/local/libguestfs.pc.in index 129682be8..46cef1e16 100644 --- a/lib/local/libguestfs.pc.in +++ b/lib/local/libguestfs.pc.in @@ -26,7 +26,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/lib/.libs -includedir=@abs_top_srcdir@/lib +includedir=@abs_top_srcdir@/include Name: libguestfs Version: @VERSION@ -- 2.26.2

On Mon, Oct 05, 2015 at 02:17:52PM +0100, Richard W.M. Jones wrote: > On Mon, Oct 05, 2015 at 03:40:01PM +0300, Roman Kagan wrote: > > -guestsdir="$(cd ../tests/guests && pwd)" > > -f="$guestsdir/windows.img" > > +abs_top_builddir="$(cd ..; pwd)" > > You don't need to define abs_top_builddir, as it should already be > defined. However it won't be exported to the test scripts unless you > change v2v/Makefile.am: TESTS_ENVIRONMENT to include it, something > like this: > > -TESTS_ENVIRO...

On 4/23/20 2:13 PM, Richard W.M. Jones wrote: > Compiling nbdkit from source when an older nbdkit is installed would > fail because certain symbols such as .get_ready are not defined in the > (installed) <nbdkit-plugin.h>: > > ../../src/libguestfs.org/nbdkit/nbdkit.go:541:8: plugin.get_ready undefined (type _Ctype_struct_nbdkit_plugin has no field or method get_ready) >

This series makes several enhancements to tests for v2v conversion of Windows guests. Specifically, it - adds a number of files which imitate the stuff that is supposed to be present on the host when the actual conversion is performed, but may not be there when the tests are run. This includes certain tools and virtio drivers - fixes the test for windows conversion to actually

...IO_WIN="$abs_builddir/../tests/fake-virtio-win" d=test-v2v-cdrom.d rm -rf $d diff --git a/v2v/test-v2v-i-ova-two-disks.sh b/v2v/test-v2v-i-ova-two-disks.sh index ede6766..e7b4137 100755 --- a/v2v/test-v2v-i-ova-two-disks.sh +++ b/v2v/test-v2v-i-ova-two-disks.sh @@ -34,6 +34,7 @@ fi abs_top_builddir="$(cd ..; pwd)" export VIRT_TOOLS_DATA_DIR="$abs_top_builddir/tests/fake-virt-tools" +export VIRTIO_WIN="$abs_top_builddir/tests/fake-virtio-win" d=test-v2v-i-ova-two-disks.d rm -rf $d diff --git a/v2v/test-v2v-i-ova.sh b/v2v/test-v2v-i-ova.sh index 37fc89e..aaf50...

...ml +++ b/tests/rhbz1232192.xml.in @@ -14,12 +14,12 @@ <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> - <source file='../test-data/phony-guests/windows.img'/> + <source file='@abs_top_builddir@/test-data/phony-guests/windows.img'/> <target dev='hda' bus='ide'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> - <source file='../test-data/phony-guests...

See individual patches for details. Pino Toscano (5): Include signal.h Remove unused variables Push -Wsuggest-attribute=noreturn only with GCC tests: do not set libguestfs environment variables Define the GCC version macro Makefile.am | 2 +- conversion.c | 3 +++ p2v.h | 7 +++++++ ssh.c | 8 +++++--- 4 files changed, 16 insertions(+), 4 deletions(-) -- 2.21.0

...lder/Makefile.am +++ b/builder/Makefile.am @@ -310,23 +310,14 @@ CLEANFILES += \ console-*.img \ console-*.out -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils -I $(abs_top_builddir)/common/mlpcre -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(b...

...> > +# This fake pkg-config program is used to trick cgo so that > > +# "#cgo pkg-config nbdkit" lines are processed relative to the local > > +# directory and not the installed nbdkit. > > + > > +case "$1" in > > + --cflags*) echo "-I@abs_top_builddir@/include" ;; > > + *) ;; > > +esac > > Don't you need something like this too: > > --libs) echo "-L@abs_top_builddir@/lib -lnbdkit" We don't actually have "libnbdkit". It was proposed a while back but we didn't get sufficient r...

...RE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +# This fake pkg-config program is used to trick cgo so that +# "#cgo pkg-config nbdkit" lines are processed relative to the local +# directory and not the installed nbdkit. + +case "$1" in + --cflags*) echo "-I@abs_top_builddir@/include" ;; + *) ;; +esac -- 2.18.2

...-- a/m4/guestfs_progs.m4 +++ b/m4/guestfs_progs.m4 @@ -125,7 +125,7 @@ dnl Check for valgrind AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind],[no]) AS_IF([test "x$VALGRIND" != "xno"],[ # Substitute the whole valgrind command. - VG='$(VALGRIND) --vgdb=no --log-file=$(abs_top_builddir)/tmp/valgrind-%q{T}-%p.log --leak-check=full --error-exitcode=119 --suppressions=$(abs_top_srcdir)/valgrind-suppressions' + VG='$(VALGRIND) --vgdb=no --log-file=$(abs_top_builddir)/tmp/valgrind-%q{T}-%p.log --leak-check=full --error-exitcode=119 --suppressions=$(abs_top_srcdir)/valgrind-...

...-linkpkg \ + mlpcre.$(MLARCHIVE) mlcutils.$(MLARCHIVE) mlstdutils.$(MLARCHIVE) \ $(OBJECTS) # OCaml dependencies. @@ -325,7 +330,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils $^ | \ + $(OCAMLFIND) ocamldep -I $(abs_srcdir) -I $(abs_top_builddir)/common/mlstdutils -I $(abs_top_builddir)/common/mlutils -I $(abs_top_builddir)/common/mlpcre $^ | \ $(SED) 's/ *$$//' | \ $(SED) -e :a -e '/ *\\$$/N; s...

...-376,7 +376,7 @@ test-virt-p2v-pxe.sshd_config: test-virt-p2v-pxe.sshd_config.in test-virt-p2v-pxe.authorized_keys: test-virt-p2v-pxe.id_rsa.pub $(top_builddir)/run rm -f $@ $@-t - $(top_builddir)/run sh -c 'echo -n environment=\"PATH=$$PATH\",environment=\"LD_LIBRARY_PATH=$(abs_top_builddir)/lib/.libs\",environment=\"LIBGUESTFS_PATH=$(abs_top_builddir)/appliance\",environment=\"LIBGUESTFS_CACHEDIR=$(abs_top_builddir)/tmp\"\ ' > $@-t + $(top_builddir)/run sh -c 'echo -n environment=\"PATH=$$PATH\"\ ' > $@-t cat $< >> $@-t...

- run bindtests.opt only if available - use ocamlc -custom - Don't try to install native code if it hasn't been built (Thanks to Olaf Hering) --- mllib/Makefile.am | 2 +- ocaml/Makefile.am | 7 ++++++- ocaml/examples/Makefile.am | 11 ++++------- ocaml/run-bindtests | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mllib/Makefile.am

...agan wrote: > On Mon, Oct 05, 2015 at 02:17:52PM +0100, Richard W.M. Jones wrote: > > On Mon, Oct 05, 2015 at 03:40:01PM +0300, Roman Kagan wrote: > > > -guestsdir="$(cd ../tests/guests && pwd)" > > > -f="$guestsdir/windows.img" > > > +abs_top_builddir="$(cd ..; pwd)" > > > > You don't need to define abs_top_builddir, as it should already be > > defined. However it won't be exported to the test scripts unless you > > change v2v/Makefile.am: TESTS_ENVIRONMENT to include it, something > > like this:...