search for: v2v_unit_tests_link

...MLLINKFLAGS) \ $(COPY_TO_LOCAL_OBJECTS) -o $@ @@ -367,9 +367,9 @@ v2v_unit_tests_DEPENDENCIES = \ ../common/mltools/mltools.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlv2v/mlv2v.$(MLARCHIVE) \ - $(top_srcdir)/ocaml-link.sh + $(top_builddir)/ocaml-link.sh v2v_unit_tests_LINK = \ - $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ + $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \ $(OCAMLPACKAGES) -package oUnit \ $(OCAMLLINKFLAGS) \ @@ -378,9 +378,9 @@ v2v_unit_tests_LINK = \ var_expander_...

...)/rhv-upload-createvm.py + $(srcdir)/embed.sh code $^ $@ +output_rhv_upload_plugin_source.ml: $(srcdir)/rhv-upload-plugin.py + $(srcdir)/embed.sh code $^ $@ +output_rhv_upload_precheck_source.ml: $(srcdir)/rhv-upload-precheck.py + $(srcdir)/embed.sh code $^ $@ if HAVE_OCAML @@ -578,7 +578,7 @@ v2v_unit_tests_LINK = \ $(v2v_unit_tests_THEOBJECTS) -o $@ # Dependencies. -.depend: $(srcdir)/*.mli $(srcdir)/*.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml output_rhv_upload_createvm_source.ml output_rhv_upload_plugin_source.ml output_rhv_upload_precheck_source.ml $(top_builddir)/ocaml-dep.sh $^ -include .d...

Building virt-v2v out-of-tree does not work and requires several small fixes here and there. Tomáš Golembiovský (3): build: perform gnulib check from source directory build: run ocaml-link.sh from build directory docs: don't perform lookup on absolute paths cfg.mk | 1 + podwrapper.pl.in | 2 ++ v2v/Makefile.am | 16 ++++++++-------- 3 files changed, 11 insertions(+), 8

...XTRA_DIST = \ SOURCES_MLI = \ changeuid.mli \ cmdline.mli \ + config.mli \ convert_linux.mli \ convert_windows.mli \ create_libvirt_xml.mli \ @@ -100,6 +102,7 @@ SOURCES_MLI = \ windows_virtio.mli SOURCES_ML = \ + config.ml \ types.ml \ uefi.ml \ utils.ml \ @@ -697,6 +700,7 @@ v2v_unit_tests_LINK = \ .depend: \ $(srcdir)/*.mli \ $(srcdir)/*.ml \ + config.ml \ output_rhv_upload_*_source.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/v2v/config.ml.in b/v2v/config.ml.in new file mode 100644 index 000000000..240f60868 --- /dev/null +++ b/v2v/config.ml.in @@ -0,0 +1,2...

...HAVE_OCAMLOPT -%.cmx: %.ml +%.cmx: $(srcdir)/%.ml $(guestfs_am_v_ocamlopt)$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@ endif diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 50611e7d2e..da34dd2645 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -542,7 +542,7 @@ v2v_unit_tests_LINK = \ $(v2v_unit_tests_THEOBJECTS) -o $@ # Dependencies. -.depend: *.mli *.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am index 5c38a7266b..d69188969e 100644 --- a/v2v/te...

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

...else v2v_unit_tests_THEOBJECTS = $(v2v_unit_tests_XOBJECTS) v2v_unit_tests.cmx: OCAMLPACKAGES += -package oUnit + +var_expander_tests_THEOBJECTS = $(var_expander_tests_XOBJECTS) +var_expander_tests.cmx: OCAMLPACKAGES += -package oUnit endif v2v_unit_tests_DEPENDENCIES = \ @@ -696,6 +713,17 @@ v2v_unit_tests_LINK = \ $(OCAMLLINKFLAGS) \ $(v2v_unit_tests_THEOBJECTS) -o $@ +var_expander_tests_DEPENDENCIES = \ + $(var_expander_tests_THEOBJECTS) \ + ../common/mlpcre/mlpcre.$(MLARCHIVE) \ + $(top_srcdir)/ocaml-link.sh +var_expander_tests_LINK = \ + $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)&...

...f HAVE_OCAMLOPT -%.cmx: %.ml +%.cmx: $(srcdir)/%.ml $(guestfs_am_v_ocamlopt)$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@ endif diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 3a978d727..341a735ab 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -536,7 +536,7 @@ v2v_unit_tests_LINK = \ $(v2v_unit_tests_THEOBJECTS) -o $@ # Dependencies. -.depend: *.mli *.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am index 5c38a7266..d69188969 100644 --- a/v2v/test...

...unit_tests_XOBJECTS) v2v_unit_tests.cmx: OCAMLPACKAGES += -package oUnit endif -v2v_unit_tests_DEPENDENCIES = $(v2v_unit_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh +v2v_unit_tests_DEPENDENCIES = \ + $(v2v_unit_tests_THEOBJECTS) \ + ../mllib/mllib.$(MLARCHIVE) \ + $(top_srcdir)/ocaml-link.sh v2v_unit_tests_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \ -- 2.7.4

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.

...XTRA_DIST = \ SOURCES_MLI = \ changeuid.mli \ cmdline.mli \ + config.mli \ convert_linux.mli \ convert_windows.mli \ create_libvirt_xml.mli \ @@ -100,6 +102,7 @@ SOURCES_MLI = \ windows_virtio.mli SOURCES_ML = \ + config.ml \ types.ml \ uefi.ml \ utils.ml \ @@ -697,6 +700,7 @@ v2v_unit_tests_LINK = \ .depend: \ $(srcdir)/*.mli \ $(srcdir)/*.ml \ + config.ml \ output_rhv_upload_*_source.ml $(top_builddir)/ocaml-dep.sh $^ -include .depend diff --git a/v2v/config.ml.in b/v2v/config.ml.in new file mode 100644 index 000000000..f24cd1629 --- /dev/null +++ b/v2v/config.ml.in @@ -0,0 +1,2...

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, it's easier to switch to using OUnit2 for unit tests. --- .gitignore | 2 +- README | 2 +- mllib/JSON_tests.ml | 56

...ECTS) -o $@ @@ -319,9 +328,9 @@ v2v_unit_tests_THEOBJECTS = $(v2v_unit_tests_XOBJECTS) v2v_unit_tests.cmx: OCAMLPACKAGES += -package oUnit endif -v2v_unit_tests_DEPENDENCIES = $(v2v_unit_tests_THEOBJECTS) +v2v_unit_tests_DEPENDENCIES = $(v2v_unit_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh v2v_unit_tests_LINK = \ - ./link.sh \ + $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \ $(OCAMLPACKAGES) -package oUnit \ $(OCAMLLINKFLAGS) \ diff --git a/v2v/link.sh.in b/v2v/link.sh.in deleted file mode 100644 index 15b6e66..0000000 --- a/v2v/link.sh.i...

...y_to_local_LINK = \ @@ -504,6 +505,7 @@ v2v_unit_tests_DEPENDENCIES = \ $(v2v_unit_tests_THEOBJECTS) \ ../common/mlstdutils/mlstdutils.$(MLARCHIVE) \ ../common/mlxml/mlxml.$(MLARCHIVE) \ + ../common/mlutils/mlcutils.$(MLARCHIVE) \ ../mllib/mllib.$(MLARCHIVE) \ $(top_srcdir)/ocaml-link.sh v2v_unit_tests_LINK = \ @@ -518,7 +520,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/mlxml -I $(abs_top_builddir)/mllib -I $(abs_...

...rt-v2v-copy-to-local.pod: virt-v2v-copy-to-local.pod $< touch $@ -CLEANFILES += \ - stamp-virt-v2v.pod \ - stamp-virt-v2v-copy-to-local.pod \ - virt-v2v.1 \ - virt-v2v-copy-to-local.1 - # Tests. # The virt-v2v tests here are not meant to be thorough tests of guest @@ -421,8 +413,6 @@ v2v_unit_tests_LINK = \ $(OCAMLLINKFLAGS) \ $(v2v_unit_tests_THEOBJECTS) -o $@ -CLEANFILES += oUnit-* - # Dependencies. depend: .depend @@ -439,6 +429,4 @@ depend: .depend endif -DISTCLEANFILES = .depend - .PHONY: depend docs diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am...

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with

...$@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/v2v/Makefile.am b/v2v/Makefile.am index f1f8fb824..7f260e3c0 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -515,19 +515,10 @@ v2v_unit_tests_LINK = \ $(v2v_unit_tests_THEOBJECTS) -o $@ # 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/mluti...

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.