Richard W.M. Jones
2017-Aug-08 14:34 UTC
[Libguestfs] [PATCH] build: Add a common script for generating OCaml dependencies correctly.
These are generated in many different ways in the various subdirectories, and sometimes not generated correctly. Introduce a script to do this in one place, and hopefully correctly. This is mostly simple refactoring, but I got rid of a couple of things: (1) The ‘make depend’ rule doesn't appear to be needed. automake (or make?) seems to rebuild the ‘.depend’ file automatically just because it is included. (2) I got rid of the hairy path rewriting sed expression. Possibly that is needed for srcdir != builddir. --- .gitignore | 1 + builder/Makefile.am | 17 +++--------- common/mlpcre/Makefile.am | 15 ++-------- common/mlprogress/Makefile.am | 17 +++--------- common/mlstdutils/Makefile.am | 17 +++--------- common/mlutils/Makefile.am | 15 ++-------- common/mlvisit/Makefile.am | 17 +++--------- common/mlxml/Makefile.am | 15 ++-------- configure.ac | 2 ++ customize/Makefile.am | 17 +++--------- daemon/Makefile.am | 15 ++-------- dib/Makefile.am | 17 +++--------- generator/Makefile.am | 15 ++-------- get-kernel/Makefile.am | 17 ++---------- mllib/Makefile.am | 15 ++-------- ocaml-dep.sh.in | 64 +++++++++++++++++++++++++++++++++++++++++++ ocaml/Makefile.am | 13 ++------- resize/Makefile.am | 15 ++-------- sparsify/Makefile.am | 17 +++--------- sysprep/Makefile.am | 17 +++--------- v2v/Makefile.am | 15 ++-------- v2v/test-harness/Makefile.am | 15 ++-------- 22 files changed, 131 insertions(+), 237 deletions(-) diff --git a/.gitignore b/.gitignore index 0e7a649f8..4d738d10f 100644 --- a/.gitignore +++ b/.gitignore @@ -380,6 +380,7 @@ Makefile.in /mllib/getopt_tests /mllib/JSON_tests /mllib/oUnit-* +/ocaml-dep.sh /ocaml/bindtests.bc /ocaml/bindtests.opt /ocaml/bindtests.ml diff --git a/builder/Makefile.am b/builder/Makefile.am index 1b51376be..e1c7bd016 100644 --- a/builder/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)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs # virt-builder's default repository diff --git a/common/mlpcre/Makefile.am b/common/mlpcre/Makefile.am index aa638cd94..fd4027a1f 100644 --- a/common/mlpcre/Makefile.am +++ b/common/mlpcre/Makefile.am @@ -124,19 +124,10 @@ check-valgrind: $(MAKE) VG="@VG@" check # Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../../ocaml -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/common/mlprogress/Makefile.am b/common/mlprogress/Makefile.am index d4a229451..189aa5453 100644 --- a/common/mlprogress/Makefile.am +++ b/common/mlprogress/Makefile.am @@ -92,20 +92,11 @@ $(MLPROGRESS_CMA): $(OBJECTS) libmlprogress.a -cclib -lprogress \ -o mlprogress -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../../ocaml -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am index ccf7c6884..5208e491f 100644 --- a/common/mlstdutils/Makefile.am +++ b/common/mlstdutils/Makefile.am @@ -147,18 +147,9 @@ endif check-valgrind: $(MAKE) VG="@VG@" check -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend -.PHONY: depend docs +.PHONY: docs diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am index f29ffc062..ab92424d5 100644 --- a/common/mlutils/Makefile.am +++ b/common/mlutils/Makefile.am @@ -135,17 +135,8 @@ c_utils_unit_tests_LINK = \ $(c_utils_unit_tests_THEOBJECTS) -o $@ # Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend -.PHONY: depend docs +.PHONY: docs diff --git a/common/mlvisit/Makefile.am b/common/mlvisit/Makefile.am index 2019efd75..fcf3bc0be 100644 --- a/common/mlvisit/Makefile.am +++ b/common/mlvisit/Makefile.am @@ -134,20 +134,11 @@ endif check-valgrind: $(MAKE) VG="@VG@" check -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../../ocaml -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/common/mlxml/Makefile.am b/common/mlxml/Makefile.am index 1a989949f..87d3f67c5 100644 --- a/common/mlxml/Makefile.am +++ b/common/mlxml/Makefile.am @@ -89,19 +89,10 @@ $(MLXML_CMA): $(OBJECTS) libmlxml.a -o mlxml # Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/configure.ac b/configure.ac index 7f9c1dac0..254200cc9 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,8 @@ AC_CONFIG_FILES([inspector/test-virt-inspector.sh], [chmod +x,-w inspector/test-virt-inspector.sh]) AC_CONFIG_FILES([installcheck.sh], [chmod +x,-w installcheck.sh]) +AC_CONFIG_FILES([ocaml-dep.sh], + [chmod +x,-w ocaml-dep.sh]) AC_CONFIG_FILES([p2v/virt-p2v-make-disk], [chmod +x,-w p2v/virt-p2v-make-disk]) AC_CONFIG_FILES([p2v/virt-p2v-make-kickstart], diff --git a/customize/Makefile.am b/customize/Makefile.am index f660346f6..9e82039b5 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -303,20 +303,11 @@ CLEANFILES += \ password-*.log \ settings-*.img -# 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/mlutils -I $(abs_top_builddir)/mllib $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 63b28f52d..b26c43ed2 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -329,17 +329,8 @@ camldaemon.o: $(OBJECTS) $(OBJECTS) # OCaml dependencies. -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 -I $(abs_top_builddir)/common/mlpcre $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend # Tests. @@ -420,4 +411,4 @@ stamp-guestfsd.pod: guestfsd.pod $< touch $@ -.PHONY: depend force +.PHONY: force diff --git a/dib/Makefile.am b/dib/Makefile.am index cc1287b35..d3a40b9b0 100644 --- a/dib/Makefile.am +++ b/dib/Makefile.am @@ -142,20 +142,11 @@ stamp-virt-dib.pod: virt-dib.pod $< touch $@ -# 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)/mllib $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/generator/Makefile.am b/generator/Makefile.am index 1936d0898..35b7a4209 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -182,18 +182,9 @@ generator: $(objects) $(OCAMLPACKAGES) -linkpkg mlstdutils.cma \ $^ -o $@ -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) $(wildcard $(abs_srcdir)/common/mlstdutils/*.mli) $(wildcard $(abs_srcdir)/common/mlstdutils/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../common/mlstdutils -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend noinst_DATA = stamp-generator diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am index 6cc7ec2fb..022678a2a 100644 --- a/get-kernel/Makefile.am +++ b/get-kernel/Makefile.am @@ -125,20 +125,9 @@ stamp-virt-get-kernel.pod: virt-get-kernel.pod $< touch $@ -# 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)/mllib $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif - -.PHONY: depend diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 49bd5e7fb..82b9482d9 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -240,19 +240,10 @@ check-valgrind: $(MAKE) VG="@VG@" check # Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in new file mode 100755 index 000000000..8f48fdb64 --- /dev/null +++ b/ocaml-dep.sh.in @@ -0,0 +1,64 @@ +#!/bin/bash - +# (C) Copyright 2009-2017 Red Hat Inc. +# @configure_input@ +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# This is a smarter wrapper around ocamldep(1) which is used to create +# the .depend files which are present in each subdirectory that builds +# OCaml code. +# +# Usage: +# .depend: *.mli *.ml +# $(top_builddir)/ocaml-dep.sh $^ +# -include .depend + +set -e + +# List of directories that contain common OCaml libraries. If it +# contains OCaml code that can be included from another directory, +# then it should go here. Note that OCaml modules in these +# directories must have unique names (eg. not ‘Utils’) else +# dependencies don't get built right. +include_dirs=" +common/mlpcre +common/mlprogress +common/mlstdutils +common/mlutils +common/mlvisit +common/mlxml +customize +mllib +ocaml +" + +# Output file is always created in the current directory. +output=.depend + +includes="" +for i in $include_dirs; do + includes="$includes -I @abs_top_srcdir@/$i -I @abs_top_builddir@/$i" +done + +rm -f $output $output-t + +echo " OCAMLDEP $output" + +@OCAMLFIND@ ocamldep $includes "$@" | + @SED@ 's/ *$//' | + @SED@ -e :a -e '/ *\\$/N; s/ *\\\n */ /; ta' | + sort > $output-t + +mv $output-t $output diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 91be080bf..c6a458a2a 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -185,17 +185,8 @@ guestfs.cmx: guestfs.ml $(guestfs_am_v_ocamlopt)$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $@ endif -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) $(wildcard $(abs_srcdir)/t/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly diff --git a/resize/Makefile.am b/resize/Makefile.am index af65acbf5..e39f9da35 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -137,19 +137,10 @@ check-valgrind: $(MAKE) VG="@VG@" check # 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)/mllib $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index c8062f353..5c57e8aa5 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -143,20 +143,11 @@ endif ENABLE_APPLIANCE check-valgrind: $(MAKE) VG="@VG@" check -# 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)/mllib $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +# OCaml dependencies. +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index f42722453..ee0b3e5dc 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -216,20 +216,11 @@ check-valgrind-local-guests: $(top_builddir)/run --test @VG@ virt-sysprep -n -c "$(libvirt_ro_uri)" -d "$$g" || exit $$?; \ done -# 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)/mllib -I $(abs_top_builddir)/customize $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-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/mlutils -I $(abs_top_builddir)/common/mlxml -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)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh $^ -include .depend endif -.PHONY: depend docs +.PHONY: docs diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am index bcfcdf21d..8691c57c3 100644 --- a/v2v/test-harness/Makefile.am +++ b/v2v/test-harness/Makefile.am @@ -126,20 +126,11 @@ stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod touch $@ # 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/mlxml -I $(abs_top_builddir)/mllib -I $(abs_top_builddir)/customize -I $(abs_top_builddir)/v2v $^ | \ - $(SED) 's/ *$$//' | \ - $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ - sort > $@-t - mv $@-t $@ - +.depend: *.mli *.ml + $(top_builddir)/ocaml-dep.sh -I .. $^ -include .depend endif endif -.PHONY: depend docs +.PHONY: docs -- 2.13.1
Pino Toscano
2017-Aug-09 13:40 UTC
Re: [Libguestfs] [PATCH] build: Add a common script for generating OCaml dependencies correctly.
On Tuesday, 8 August 2017 16:34:49 CEST Richard W.M. Jones wrote:> These are generated in many different ways in the various > subdirectories, and sometimes not generated correctly. Introduce a > script to do this in one place, and hopefully correctly. > > This is mostly simple refactoring, but I got rid of a couple of > things: > > (1) The ‘make depend’ rule doesn't appear to be needed. automake (or > make?) seems to rebuild the ‘.depend’ file automatically just because > it is included. > > (2) I got rid of the hairy path rewriting sed expression. Possibly > that is needed for srcdir != builddir. > ---Mostly LGTM, just one note:> +echo " OCAMLDEP $output"I'd remove this, since it the makefile will output the ocaml-dep.sh invocation anyway -- a better solution should be done by taking the silent build configuration into account. BTW, unrelated to this patch, just because I'm noticing them: what are all the "docs" dependencies in .PHONY? At least for newer Makefile's I guess they were just copied from existing ones, but I did not find any reference/reason for the ones in older tools. Do you remember more about them? -- Pino Toscano
Richard Jones
2017-Aug-09 13:54 UTC
[Libguestfs] check-release success (was: Re: [PATCH] build: Add a common script for generating OCaml dependencies correctly.)
]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/erlang' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/erlang' PASS: tests/010-load.erl PASS: tests/030-config.erl PASS: run-bindtests PASS: tests/070-optargs.erl PASS: tests/050-lvcreate.erl PASS: tests/060-readdir.erl ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 6 # PASS: 6 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/erlang' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/erlang' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/erlang' Making check in erlang/examples make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/erlang/examples' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/erlang/examples' Making check in lua make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/lua' ln -sf .libs/libluaguestfs.so guestfs.so make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/lua' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/lua' PASS: tests/015-globals.lua PASS: run-bindtests PASS: tests/020-create.lua PASS: tests/025-create-flags.lua PASS: tests/010-load.lua PASS: tests/030-config.lua PASS: tests/400-events.lua PASS: tests/027-create-multiple.lua PASS: tests/070-optargs.lua PASS: tests/900-errors.lua PASS: tests/060-readdir.lua PASS: tests/050-lvcreate.lua PASS: tests/400-progress.lua ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 13 # PASS: 13 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/lua' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/lua' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/lua' Making check in lua/examples make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/lua/examples' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/lua/examples' Making check in gobject make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make check-am make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make check-TESTS make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make[4]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' SKIP: run-tests PASS: run-tests-retvalues PASS: run-live-tests ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 3 # PASS: 2 # SKIP: 1 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[4]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/gobject' Making check in csharp make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/csharp' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/csharp' Making check in common/mlprogress make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlprogress' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlprogress' Making check in common/mlvisit make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' make visit_tests make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' CC dummy.o OCAMLOPT visit_tests.cmx File "visit_tests.ml", line 111, characters 25-31: Warning 52: Code should not depend on the actual values of this constructor's arguments. They are only for information and may change in future versions. (See manual section 8.5) File "visit_tests.ml", line 119, characters 16-23: Warning 52: Code should not depend on the actual values of this constructor's arguments. They are only for information and may change in future versions. (See manual section 8.5) GEN visit_tests make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' PASS: visit_tests ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 1 # PASS: 1 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlvisit' Making check in common/mlxml make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlxml' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/common/mlxml' Making check in mllib make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' make getopt_tests common_utils_tests JSON_tests make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' CC getopt_tests-dummy.o OCAMLOPT getopt_tests.cmx CC common_utils_tests-dummy.o OCAMLOPT common_utils_tests.cmx CC dummy.o OCAMLOPT JSON_tests.cmx GEN getopt_tests GEN JSON_tests GEN common_utils_tests make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' PASS: JSON_tests PASS: common_utils_tests PASS: test-getopt.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 3 # PASS: 3 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/mllib' Making check in customize make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/customize' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/customize' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/customize' rm -f test-firstboot-rhel-4.9.sh test-firstboot-rhel-4.9.sh-t rm -f test-firstboot-rhel-5.11.sh test-firstboot-rhel-5.11.sh-t rm -f test-firstboot-rhel-6.8.sh test-firstboot-rhel-6.8.sh-t f=`echo "test-firstboot-rhel-4.9.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-rhel-4.9.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-rhel-4.9.sh-t f=`echo "test-firstboot-rhel-5.11.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-rhel-5.11.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-rhel-5.11.sh-t f=`echo "test-firstboot-rhel-6.8.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-rhel-6.8.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-rhel-6.8.sh-t chmod 0755 test-firstboot-rhel-4.9.sh-t chmod 0755 test-firstboot-rhel-6.8.sh-t mv test-firstboot-rhel-4.9.sh-t test-firstboot-rhel-4.9.sh mv test-firstboot-rhel-6.8.sh-t test-firstboot-rhel-6.8.sh chmod 0755 test-firstboot-rhel-5.11.sh-t rm -f test-firstboot-rhel-7.2.sh test-firstboot-rhel-7.2.sh-t mv test-firstboot-rhel-5.11.sh-t test-firstboot-rhel-5.11.sh rm -f test-firstboot-debian-6.sh test-firstboot-debian-6.sh-t f=`echo "test-firstboot-rhel-7.2.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-rhel-7.2.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-rhel-7.2.sh-t f=`echo "test-firstboot-debian-6.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-debian-6.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-debian-6.sh-t rm -f test-firstboot-debian-7.sh test-firstboot-debian-7.sh-t f=`echo "test-firstboot-debian-7.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-debian-7.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-debian-7.sh-t chmod 0755 test-firstboot-debian-6.sh-t chmod 0755 test-firstboot-rhel-7.2.sh-t chmod 0755 test-firstboot-debian-7.sh-t mv test-firstboot-debian-6.sh-t test-firstboot-debian-6.sh mv test-firstboot-rhel-7.2.sh-t test-firstboot-rhel-7.2.sh mv test-firstboot-debian-7.sh-t test-firstboot-debian-7.sh rm -f test-firstboot-debian-8.sh test-firstboot-debian-8.sh-t rm -f test-firstboot-fedora-25.sh test-firstboot-fedora-25.sh-t rm -f test-firstboot-fedora-26.sh test-firstboot-fedora-26.sh-t f=`echo "test-firstboot-debian-8.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-debian-8.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-debian-8.sh-t f=`echo "test-firstboot-fedora-25.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-fedora-25.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-fedora-25.sh-t f=`echo "test-firstboot-fedora-26.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-fedora-26.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-fedora-26.sh-t chmod 0755 test-firstboot-fedora-25.sh-t chmod 0755 test-firstboot-debian-8.sh-t mv test-firstboot-fedora-25.sh-t test-firstboot-fedora-25.sh mv test-firstboot-debian-8.sh-t test-firstboot-debian-8.sh chmod 0755 test-firstboot-fedora-26.sh-t rm -f test-firstboot-ubuntu-10.04.sh test-firstboot-ubuntu-10.04.sh-t mv test-firstboot-fedora-26.sh-t test-firstboot-fedora-26.sh f=`echo "test-firstboot-ubuntu-10.04.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-ubuntu-10.04.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-ubuntu-10.04.sh-t rm -f test-firstboot-ubuntu-12.04.sh test-firstboot-ubuntu-12.04.sh-t rm -f test-firstboot-ubuntu-14.04.sh test-firstboot-ubuntu-14.04.sh-t f=`echo "test-firstboot-ubuntu-12.04.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-ubuntu-12.04.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-ubuntu-12.04.sh-t f=`echo "test-firstboot-ubuntu-14.04.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-ubuntu-14.04.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-ubuntu-14.04.sh-t chmod 0755 test-firstboot-ubuntu-10.04.sh-t chmod 0755 test-firstboot-ubuntu-14.04.sh-t chmod 0755 test-firstboot-ubuntu-12.04.sh-t mv test-firstboot-ubuntu-10.04.sh-t test-firstboot-ubuntu-10.04.sh mv test-firstboot-ubuntu-14.04.sh-t test-firstboot-ubuntu-14.04.sh mv test-firstboot-ubuntu-12.04.sh-t test-firstboot-ubuntu-12.04.sh rm -f test-firstboot-ubuntu-16.04.sh test-firstboot-ubuntu-16.04.sh-t rm -f test-password-centos-7.2.sh test-password-centos-7.2.sh-t f=`echo "test-firstboot-ubuntu-16.04.sh" | /usr/bin/sed 's/test-firstboot-\(.*\).sh/\1/'`; \ echo 'script=test-firstboot-ubuntu-16.04.sh exec $srcdir/test-firstboot.sh' "$f" > test-firstboot-ubuntu-16.04.sh-t rm -f test-password-debian-6.sh test-password-debian-6.sh-t f=`echo "test-password-centos-7.2.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-centos-7.2.sh exec $srcdir/test-password.pl' "$f" > test-password-centos-7.2.sh-t f=`echo "test-password-debian-6.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-debian-6.sh exec $srcdir/test-password.pl' "$f" > test-password-debian-6.sh-t chmod 0755 test-firstboot-ubuntu-16.04.sh-t mv test-firstboot-ubuntu-16.04.sh-t test-firstboot-ubuntu-16.04.sh rm -f test-password-debian-7.sh test-password-debian-7.sh-t chmod 0755 test-password-debian-6.sh-t f=`echo "test-password-debian-7.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-debian-7.sh exec $srcdir/test-password.pl' "$f" > test-password-debian-7.sh-t chmod 0755 test-password-centos-7.2.sh-t mv test-password-debian-6.sh-t test-password-debian-6.sh mv test-password-centos-7.2.sh-t test-password-centos-7.2.sh rm -f test-password-debian-8.sh test-password-debian-8.sh-t rm -f test-password-fedora-25.sh test-password-fedora-25.sh-t f=`echo "test-password-debian-8.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-debian-8.sh exec $srcdir/test-password.pl' "$f" > test-password-debian-8.sh-t chmod 0755 test-password-debian-7.sh-t f=`echo "test-password-fedora-25.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-fedora-25.sh exec $srcdir/test-password.pl' "$f" > test-password-fedora-25.sh-t mv test-password-debian-7.sh-t test-password-debian-7.sh chmod 0755 test-password-fedora-25.sh-t chmod 0755 test-password-debian-8.sh-t mv test-password-fedora-25.sh-t test-password-fedora-25.sh mv test-password-debian-8.sh-t test-password-debian-8.sh rm -f test-password-rhel-3.9.sh test-password-rhel-3.9.sh-t rm -f test-password-rhel-4.9.sh test-password-rhel-4.9.sh-t f=`echo "test-password-rhel-3.9.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-rhel-3.9.sh exec $srcdir/test-password.pl' "$f" > test-password-rhel-3.9.sh-t f=`echo "test-password-rhel-4.9.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-rhel-4.9.sh exec $srcdir/test-password.pl' "$f" > test-password-rhel-4.9.sh-t rm -f test-password-rhel-5.11.sh test-password-rhel-5.11.sh-t f=`echo "test-password-rhel-5.11.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-rhel-5.11.sh exec $srcdir/test-password.pl' "$f" > test-password-rhel-5.11.sh-t chmod 0755 test-password-rhel-4.9.sh-t chmod 0755 test-password-rhel-3.9.sh-t chmod 0755 test-password-rhel-5.11.sh-t mv test-password-rhel-4.9.sh-t test-password-rhel-4.9.sh mv test-password-rhel-3.9.sh-t test-password-rhel-3.9.sh mv test-password-rhel-5.11.sh-t test-password-rhel-5.11.sh rm -f test-password-rhel-6.9.sh test-password-rhel-6.9.sh-t rm -f test-password-rhel-7.2.sh test-password-rhel-7.2.sh-t f=`echo "test-password-rhel-6.9.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-rhel-6.9.sh exec $srcdir/test-password.pl' "$f" > test-password-rhel-6.9.sh-t rm -f test-password-ubuntu-10.04.sh test-password-ubuntu-10.04.sh-t f=`echo "test-password-rhel-7.2.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-rhel-7.2.sh exec $srcdir/test-password.pl' "$f" > test-password-rhel-7.2.sh-t f=`echo "test-password-ubuntu-10.04.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-ubuntu-10.04.sh exec $srcdir/test-password.pl' "$f" > test-password-ubuntu-10.04.sh-t chmod 0755 test-password-rhel-6.9.sh-t chmod 0755 test-password-rhel-7.2.sh-t chmod 0755 test-password-ubuntu-10.04.sh-t mv test-password-rhel-6.9.sh-t test-password-rhel-6.9.sh mv test-password-rhel-7.2.sh-t test-password-rhel-7.2.sh mv test-password-ubuntu-10.04.sh-t test-password-ubuntu-10.04.sh rm -f test-password-ubuntu-12.04.sh test-password-ubuntu-12.04.sh-t rm -f test-password-ubuntu-14.04.sh test-password-ubuntu-14.04.sh-t f=`echo "test-password-ubuntu-12.04.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-ubuntu-12.04.sh exec $srcdir/test-password.pl' "$f" > test-password-ubuntu-12.04.sh-t rm -f test-password-ubuntu-16.04.sh test-password-ubuntu-16.04.sh-t f=`echo "test-password-ubuntu-14.04.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-ubuntu-14.04.sh exec $srcdir/test-password.pl' "$f" > test-password-ubuntu-14.04.sh-t f=`echo "test-password-ubuntu-16.04.sh" | /usr/bin/sed 's/test-password-\(.*\).sh/\1/'`; \ echo 'script=test-password-ubuntu-16.04.sh exec $srcdir/test-password.pl' "$f" > test-password-ubuntu-16.04.sh-t chmod 0755 test-password-ubuntu-12.04.sh-t mv test-password-ubuntu-12.04.sh-t test-password-ubuntu-12.04.sh rm -f test-settings-rhel-4.9.sh test-settings-rhel-4.9.sh-t chmod 0755 test-password-ubuntu-14.04.sh-t f=`echo "test-settings-rhel-4.9.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-rhel-4.9.sh exec $srcdir/test-settings.sh' "$f" > test-settings-rhel-4.9.sh-t mv test-password-ubuntu-14.04.sh-t test-password-ubuntu-14.04.sh chmod 0755 test-password-ubuntu-16.04.sh-t rm -f test-settings-rhel-5.11.sh test-settings-rhel-5.11.sh-t mv test-password-ubuntu-16.04.sh-t test-password-ubuntu-16.04.sh chmod 0755 test-settings-rhel-4.9.sh-t f=`echo "test-settings-rhel-5.11.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-rhel-5.11.sh exec $srcdir/test-settings.sh' "$f" > test-settings-rhel-5.11.sh-t mv test-settings-rhel-4.9.sh-t test-settings-rhel-4.9.sh rm -f test-settings-rhel-6.8.sh test-settings-rhel-6.8.sh-t rm -f test-settings-rhel-7.2.sh test-settings-rhel-7.2.sh-t f=`echo "test-settings-rhel-6.8.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-rhel-6.8.sh exec $srcdir/test-settings.sh' "$f" > test-settings-rhel-6.8.sh-t chmod 0755 test-settings-rhel-5.11.sh-t f=`echo "test-settings-rhel-7.2.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-rhel-7.2.sh exec $srcdir/test-settings.sh' "$f" > test-settings-rhel-7.2.sh-t chmod 0755 test-settings-rhel-6.8.sh-t mv test-settings-rhel-5.11.sh-t test-settings-rhel-5.11.sh mv test-settings-rhel-6.8.sh-t test-settings-rhel-6.8.sh chmod 0755 test-settings-rhel-7.2.sh-t rm -f test-settings-debian-6.sh test-settings-debian-6.sh-t rm -f test-settings-debian-7.sh test-settings-debian-7.sh-t mv test-settings-rhel-7.2.sh-t test-settings-rhel-7.2.sh f=`echo "test-settings-debian-6.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-debian-6.sh exec $srcdir/test-settings.sh' "$f" > test-settings-debian-6.sh-t f=`echo "test-settings-debian-7.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-debian-7.sh exec $srcdir/test-settings.sh' "$f" > test-settings-debian-7.sh-t rm -f test-settings-debian-8.sh test-settings-debian-8.sh-t chmod 0755 test-settings-debian-6.sh-t f=`echo "test-settings-debian-8.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-debian-8.sh exec $srcdir/test-settings.sh' "$f" > test-settings-debian-8.sh-t mv test-settings-debian-6.sh-t test-settings-debian-6.sh chmod 0755 test-settings-debian-7.sh-t rm -f test-settings-fedora-25.sh test-settings-fedora-25.sh-t mv test-settings-debian-7.sh-t test-settings-debian-7.sh f=`echo "test-settings-fedora-25.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-fedora-25.sh exec $srcdir/test-settings.sh' "$f" > test-settings-fedora-25.sh-t chmod 0755 test-settings-debian-8.sh-t rm -f test-settings-ubuntu-10.04.sh test-settings-ubuntu-10.04.sh-t mv test-settings-debian-8.sh-t test-settings-debian-8.sh f=`echo "test-settings-ubuntu-10.04.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-ubuntu-10.04.sh exec $srcdir/test-settings.sh' "$f" > test-settings-ubuntu-10.04.sh-t chmod 0755 test-settings-fedora-25.sh-t rm -f test-settings-ubuntu-12.04.sh test-settings-ubuntu-12.04.sh-t chmod 0755 test-settings-ubuntu-10.04.sh-t mv test-settings-fedora-25.sh-t test-settings-fedora-25.sh f=`echo "test-settings-ubuntu-12.04.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-ubuntu-12.04.sh exec $srcdir/test-settings.sh' "$f" > test-settings-ubuntu-12.04.sh-t mv test-settings-ubuntu-10.04.sh-t test-settings-ubuntu-10.04.sh rm -f test-settings-ubuntu-14.04.sh test-settings-ubuntu-14.04.sh-t rm -f test-settings-ubuntu-16.04.sh test-settings-ubuntu-16.04.sh-t f=`echo "test-settings-ubuntu-14.04.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-ubuntu-14.04.sh exec $srcdir/test-settings.sh' "$f" > test-settings-ubuntu-14.04.sh-t chmod 0755 test-settings-ubuntu-12.04.sh-t f=`echo "test-settings-ubuntu-16.04.sh" | /usr/bin/sed 's/test-settings-\(.*\).sh/\1/'`; \ echo 'script=test-settings-ubuntu-16.04.sh exec $srcdir/test-settings.sh' "$f" > test-settings-ubuntu-16.04.sh-t mv test-settings-ubuntu-12.04.sh-t test-settings-ubuntu-12.04.sh chmod 0755 test-settings-ubuntu-14.04.sh-t mv test-settings-ubuntu-14.04.sh-t test-settings-ubuntu-14.04.sh chmod 0755 test-settings-ubuntu-16.04.sh-t mv test-settings-ubuntu-16.04.sh-t test-settings-ubuntu-16.04.sh SKIP: test-firstboot-rhel-6.8.sh SKIP: test-firstboot-rhel-5.11.sh SKIP: test-firstboot-rhel-4.9.sh PASS: test-virt-customize-docs.sh SKIP: test-firstboot-rhel-7.2.sh SKIP: test-firstboot-debian-6.sh SKIP: test-firstboot-debian-7.sh SKIP: test-firstboot-debian-8.sh SKIP: test-firstboot-fedora-25.sh SKIP: test-firstboot-fedora-26.sh SKIP: test-firstboot-ubuntu-10.04.sh SKIP: test-firstboot-ubuntu-12.04.sh SKIP: test-firstboot-ubuntu-14.04.sh SKIP: test-firstboot-ubuntu-16.04.sh SKIP: test-password-centos-7.2.sh SKIP: test-password-debian-6.sh SKIP: test-password-debian-7.sh SKIP: test-password-debian-8.sh SKIP: test-password-fedora-25.sh SKIP: test-password-rhel-3.9.sh SKIP: test-password-rhel-4.9.sh SKIP: test-password-rhel-6.9.sh SKIP: test-password-rhel-5.11.sh SKIP: test-password-rhel-7.2.sh SKIP: test-password-ubuntu-10.04.sh SKIP: test-password-ubuntu-12.04.sh SKIP: test-password-ubuntu-14.04.sh SKIP: test-password-ubuntu-16.04.sh SKIP: test-settings-rhel-5.11.sh SKIP: test-settings-rhel-4.9.sh SKIP: test-settings-rhel-7.2.sh SKIP: test-settings-rhel-6.8.sh SKIP: test-settings-debian-7.sh SKIP: test-settings-debian-6.sh SKIP: test-settings-debian-8.sh SKIP: test-settings-fedora-25.sh SKIP: test-settings-ubuntu-10.04.sh SKIP: test-settings-ubuntu-12.04.sh SKIP: test-settings-ubuntu-14.04.sh SKIP: test-settings-ubuntu-16.04.sh PASS: test-virt-customize.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 41 # PASS: 2 # SKIP: 39 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/customize' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/customize' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/customize' Making check in builder make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder' make yajl_tests debian.xz fedora.xz ubuntu.xz windows.xz fedora.qcow2 fedora.qcow2.xz make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder' CC yajl_tests-yajl-c.o OCAMLOPT yajl_tests.cmx rm -f debian.xz debian.xz-t rm -f fedora.xz fedora.xz-t xz --best -c ../test-data/phony-guests/debian.img > debian.xz-t xz --best -c ../test-data/phony-guests/fedora.img > fedora.xz-t rm -f ubuntu.xz ubuntu.xz-t xz --best -c ../test-data/phony-guests/ubuntu.img > ubuntu.xz-t rm -f windows.xz windows.xz-t xz --best -c ../test-data/phony-guests/windows.img > windows.xz-t rm -f fedora.qcow2 fedora.qcow2-t qemu-img convert -f raw -O qcow2 ../test-data/phony-guests/fedora.img fedora.qcow2-t mv fedora.qcow2-t fedora.qcow2 GEN yajl_tests rm -f fedora.qcow2.xz fedora.qcow2.xz-t xz --best -c fedora.qcow2 > fedora.qcow2.xz-t mv fedora.qcow2.xz-t fedora.qcow2.xz mv windows.xz-t windows.xz mv ubuntu.xz-t ubuntu.xz mv debian.xz-t debian.xz mv fedora.xz-t fedora.xz make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder' rm -f test-console-centos-7.2.sh test-console-centos-7.2.sh-t rm -f test-console-rhel-6.8.sh test-console-rhel-6.8.sh-t f=`echo "test-console-centos-7.2.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-centos-7.2.sh exec $srcdir/test-console.sh' "$f" > test-console-centos-7.2.sh-t f=`echo "test-console-rhel-6.8.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-rhel-6.8.sh exec $srcdir/test-console.sh' "$f" > test-console-rhel-6.8.sh-t chmod 0755 test-console-rhel-6.8.sh-t mv test-console-rhel-6.8.sh-t test-console-rhel-6.8.sh chmod 0755 test-console-centos-7.2.sh-t rm -f test-console-rhel-7.2.sh test-console-rhel-7.2.sh-t mv test-console-centos-7.2.sh-t test-console-centos-7.2.sh f=`echo "test-console-rhel-7.2.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-rhel-7.2.sh exec $srcdir/test-console.sh' "$f" > test-console-rhel-7.2.sh-t rm -f test-console-debian-7.sh test-console-debian-7.sh-t f=`echo "test-console-debian-7.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-debian-7.sh exec $srcdir/test-console.sh' "$f" > test-console-debian-7.sh-t chmod 0755 test-console-rhel-7.2.sh-t chmod 0755 test-console-debian-7.sh-t mv test-console-rhel-7.2.sh-t test-console-rhel-7.2.sh mv test-console-debian-7.sh-t test-console-debian-7.sh rm -f test-console-debian-8.sh test-console-debian-8.sh-t rm -f test-console-fedora-24.sh test-console-fedora-24.sh-t f=`echo "test-console-debian-8.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-debian-8.sh exec $srcdir/test-console.sh' "$f" > test-console-debian-8.sh-t f=`echo "test-console-fedora-24.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-fedora-24.sh exec $srcdir/test-console.sh' "$f" > test-console-fedora-24.sh-t chmod 0755 test-console-debian-8.sh-t chmod 0755 test-console-fedora-24.sh-t mv test-console-debian-8.sh-t test-console-debian-8.sh mv test-console-fedora-24.sh-t test-console-fedora-24.sh rm -f test-console-ubuntu-12.04.sh test-console-ubuntu-12.04.sh-t rm -f test-console-ubuntu-14.04.sh test-console-ubuntu-14.04.sh-t f=`echo "test-console-ubuntu-12.04.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-ubuntu-12.04.sh exec $srcdir/test-console.sh' "$f" > test-console-ubuntu-12.04.sh-t f=`echo "test-console-ubuntu-14.04.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-ubuntu-14.04.sh exec $srcdir/test-console.sh' "$f" > test-console-ubuntu-14.04.sh-t chmod 0755 test-console-ubuntu-12.04.sh-t mv test-console-ubuntu-12.04.sh-t test-console-ubuntu-12.04.sh chmod 0755 test-console-ubuntu-14.04.sh-t rm -f test-console-ubuntu-16.04.sh test-console-ubuntu-16.04.sh-t mv test-console-ubuntu-14.04.sh-t test-console-ubuntu-14.04.sh f=`echo "test-console-ubuntu-16.04.sh" | /usr/bin/sed 's/test-console-\(.*\).sh/\1/'`; \ echo 'script=test-console-ubuntu-16.04.sh exec $srcdir/test-console.sh' "$f" > test-console-ubuntu-16.04.sh-t chmod 0755 test-console-ubuntu-16.04.sh-t mv test-console-ubuntu-16.04.sh-t test-console-ubuntu-16.04.sh PASS: test-virt-index-validate.sh SKIP: test-virt-builder-planner.sh PASS: test-virt-builder-docs.sh PASS: test-virt-builder-list.sh PASS: test-virt-builder-list-simplestreams.sh SKIP: test-console-centos-7.2.sh PASS: yajl_tests SKIP: test-console-rhel-6.8.sh SKIP: test-console-rhel-7.2.sh SKIP: test-console-debian-8.sh SKIP: test-console-debian-7.sh SKIP: test-console-fedora-24.sh SKIP: test-console-ubuntu-12.04.sh SKIP: test-console-ubuntu-16.04.sh SKIP: test-console-ubuntu-14.04.sh PASS: test-virt-builder.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 16 # PASS: 6 # SKIP: 10 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder' Making check in builder/templates make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' PASS: validate.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 1 # PASS: 1 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/builder/templates' Making check in get-kernel make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' PASS: test-virt-get-kernel-docs.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 1 # PASS: 1 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/get-kernel' Making check in resize make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/resize' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/resize' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/resize' PASS: test-virt-resize-docs.sh PASS: test-virt-resize.pl ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 2 # PASS: 2 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/resize' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/resize' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/resize' Making check in sparsify make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' PASS: test-virt-sparsify-docs.sh PASS: test-virt-sparsify-in-place.sh PASS: test-virt-sparsify.sh PASS: test-virt-sparsify-in-place-fstrim-unsupported.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 4 # PASS: 4 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sparsify' Making check in sysprep make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' PASS: test-virt-sysprep-docs.sh PASS: test-virt-sysprep-passwords.sh PASS: test-virt-sysprep-backup-files.sh PASS: test-virt-sysprep.sh PASS: test-virt-sysprep-script.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 5 # PASS: 5 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/sysprep' Making check in v2v make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' make v2v_unit_tests windows.vmdk make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' CC v2v_unit_tests-libvirt_utils-c.o CC v2v_unit_tests-qemuopts-c.o rm -f windows.vmdk windows.vmdk-t OCAMLOPT v2v_unit_tests.cmx if [ -s ../test-data/phony-guests/windows.img ]; then \ qemu-img convert -f raw ../test-data/phony-guests/windows.img -O vmdk windows.vmdk-t; \ mv windows.vmdk-t windows.vmdk; \ else \ touch windows.vmdk; \ fi GEN v2v_unit_tests make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' PASS: test-v2v-i-ova-bad-sha1.sh PASS: test-v2v-i-ova-bad-sha256.sh PASS: test-v2v-docs.sh PASS: test-v2v-i-ova-good-checksums.sh PASS: test-v2v-i-ova-formats.sh PASS: test-v2v-i-ova-invalid-manifest2.sh PASS: test-v2v-i-ova-invalid-manifest1.sh PASS: test-v2v-i-ova-subfolders.sh PASS: test-v2v-i-ova-gz.sh PASS: test-v2v-i-ova-tar.sh PASS: test-v2v-copy-to-local.sh PASS: test-v2v-i-ova-two-disks.sh PASS: test-v2v-i-vmx.sh PASS: test-v2v-bad-networks-and-bridges.sh PASS: v2v_unit_tests PASS: test-v2v-machine-readable.sh PASS: test-v2v-i-disk.sh PASS: test-v2v-i-ova.sh PASS: test-v2v-cdrom.sh PASS: test-v2v-windows-conversion.sh PASS: test-v2v-floppy.sh PASS: test-v2v-networks-and-bridges.sh PASS: test-v2v-virtio-win-iso.sh PASS: test-v2v-in-place.sh PASS: test-v2v-o-glance.sh PASS: test-v2v-o-libvirt.sh PASS: test-v2v-o-null.sh PASS: test-v2v-no-copy.sh PASS: test-v2v-o-qemu.sh PASS: test-v2v-o-rhv.sh PASS: test-v2v-print-source.sh PASS: test-v2v-oa-option.sh rm -f test-v2v-conversion-of-centos-6.sh test-v2v-conversion-of-centos-6.sh-t f=`echo "test-v2v-conversion-of-centos-6.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-centos-6.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-centos-6.sh-t PASS: test-v2v-o-vdsm-options.sh rm -f test-v2v-conversion-of-centos-7.0.sh test-v2v-conversion-of-centos-7.0.sh-t f=`echo "test-v2v-conversion-of-centos-7.0.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-centos-7.0.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-centos-7.0.sh-t chmod 0755 test-v2v-conversion-of-centos-6.sh-t mv test-v2v-conversion-of-centos-6.sh-t test-v2v-conversion-of-centos-6.sh rm -f test-v2v-conversion-of-debian-6.sh test-v2v-conversion-of-debian-6.sh-t chmod 0755 test-v2v-conversion-of-centos-7.0.sh-t f=`echo "test-v2v-conversion-of-debian-6.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-debian-6.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-debian-6.sh-t mv test-v2v-conversion-of-centos-7.0.sh-t test-v2v-conversion-of-centos-7.0.sh rm -f test-v2v-conversion-of-debian-7.sh test-v2v-conversion-of-debian-7.sh-t f=`echo "test-v2v-conversion-of-debian-7.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-debian-7.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-debian-7.sh-t chmod 0755 test-v2v-conversion-of-debian-6.sh-t mv test-v2v-conversion-of-debian-6.sh-t test-v2v-conversion-of-debian-6.sh rm -f test-v2v-conversion-of-debian-8.sh test-v2v-conversion-of-debian-8.sh-t chmod 0755 test-v2v-conversion-of-debian-7.sh-t f=`echo "test-v2v-conversion-of-debian-8.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-debian-8.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-debian-8.sh-t mv test-v2v-conversion-of-debian-7.sh-t test-v2v-conversion-of-debian-7.sh rm -f test-v2v-conversion-of-fedora-20.sh test-v2v-conversion-of-fedora-20.sh-t chmod 0755 test-v2v-conversion-of-debian-8.sh-t f=`echo "test-v2v-conversion-of-fedora-20.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-fedora-20.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-fedora-20.sh-t mv test-v2v-conversion-of-debian-8.sh-t test-v2v-conversion-of-debian-8.sh chmod 0755 test-v2v-conversion-of-fedora-20.sh-t rm -f test-v2v-conversion-of-fedora-23.sh test-v2v-conversion-of-fedora-23.sh-t mv test-v2v-conversion-of-fedora-20.sh-t test-v2v-conversion-of-fedora-20.sh rm -f test-v2v-conversion-of-opensuse-13.1.sh test-v2v-conversion-of-opensuse-13.1.sh-t f=`echo "test-v2v-conversion-of-fedora-23.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-fedora-23.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-fedora-23.sh-t f=`echo "test-v2v-conversion-of-opensuse-13.1.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-opensuse-13.1.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-opensuse-13.1.sh-t chmod 0755 test-v2v-conversion-of-fedora-23.sh-t chmod 0755 test-v2v-conversion-of-opensuse-13.1.sh-t mv test-v2v-conversion-of-fedora-23.sh-t test-v2v-conversion-of-fedora-23.sh mv test-v2v-conversion-of-opensuse-13.1.sh-t test-v2v-conversion-of-opensuse-13.1.sh rm -f test-v2v-conversion-of-opensuse-13.2.sh test-v2v-conversion-of-opensuse-13.2.sh-t rm -f test-v2v-conversion-of-opensuse-42.1.sh test-v2v-conversion-of-opensuse-42.1.sh-t f=`echo "test-v2v-conversion-of-opensuse-13.2.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-opensuse-13.2.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-opensuse-13.2.sh-t f=`echo "test-v2v-conversion-of-opensuse-42.1.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-opensuse-42.1.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-opensuse-42.1.sh-t chmod 0755 test-v2v-conversion-of-opensuse-13.2.sh-t mv test-v2v-conversion-of-opensuse-13.2.sh-t test-v2v-conversion-of-opensuse-13.2.sh rm -f test-v2v-conversion-of-rhel-5.10.sh test-v2v-conversion-of-rhel-5.10.sh-t f=`echo "test-v2v-conversion-of-rhel-5.10.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-rhel-5.10.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-rhel-5.10.sh-t chmod 0755 test-v2v-conversion-of-opensuse-42.1.sh-t mv test-v2v-conversion-of-opensuse-42.1.sh-t test-v2v-conversion-of-opensuse-42.1.sh rm -f test-v2v-conversion-of-rhel-6.8.sh test-v2v-conversion-of-rhel-6.8.sh-t f=`echo "test-v2v-conversion-of-rhel-6.8.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-rhel-6.8.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-rhel-6.8.sh-t chmod 0755 test-v2v-conversion-of-rhel-5.10.sh-t chmod 0755 test-v2v-conversion-of-rhel-6.8.sh-t mv test-v2v-conversion-of-rhel-5.10.sh-t test-v2v-conversion-of-rhel-5.10.sh mv test-v2v-conversion-of-rhel-6.8.sh-t test-v2v-conversion-of-rhel-6.8.sh rm -f test-v2v-conversion-of-rhel-7.0.sh test-v2v-conversion-of-rhel-7.0.sh-t rm -f test-v2v-conversion-of-rhel-7.2.sh test-v2v-conversion-of-rhel-7.2.sh-t f=`echo "test-v2v-conversion-of-rhel-7.0.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-rhel-7.0.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-rhel-7.0.sh-t f=`echo "test-v2v-conversion-of-rhel-7.2.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-rhel-7.2.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-rhel-7.2.sh-t chmod 0755 test-v2v-conversion-of-rhel-7.0.sh-t mv test-v2v-conversion-of-rhel-7.0.sh-t test-v2v-conversion-of-rhel-7.0.sh rm -f test-v2v-conversion-of-ubuntu-10.04.sh test-v2v-conversion-of-ubuntu-10.04.sh-t f=`echo "test-v2v-conversion-of-ubuntu-10.04.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-ubuntu-10.04.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-ubuntu-10.04.sh-t chmod 0755 test-v2v-conversion-of-ubuntu-10.04.sh-t mv test-v2v-conversion-of-ubuntu-10.04.sh-t test-v2v-conversion-of-ubuntu-10.04.sh rm -f test-v2v-conversion-of-ubuntu-12.04.sh test-v2v-conversion-of-ubuntu-12.04.sh-t f=`echo "test-v2v-conversion-of-ubuntu-12.04.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-ubuntu-12.04.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-ubuntu-12.04.sh-t chmod 0755 test-v2v-conversion-of-ubuntu-12.04.sh-t mv test-v2v-conversion-of-ubuntu-12.04.sh-t test-v2v-conversion-of-ubuntu-12.04.sh rm -f test-v2v-conversion-of-ubuntu-14.04.sh test-v2v-conversion-of-ubuntu-14.04.sh-t chmod 0755 test-v2v-conversion-of-rhel-7.2.sh-t f=`echo "test-v2v-conversion-of-ubuntu-14.04.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-ubuntu-14.04.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-ubuntu-14.04.sh-t mv test-v2v-conversion-of-rhel-7.2.sh-t test-v2v-conversion-of-rhel-7.2.sh rm -f test-v2v-conversion-of-ubuntu-16.04.sh test-v2v-conversion-of-ubuntu-16.04.sh-t f=`echo "test-v2v-conversion-of-ubuntu-16.04.sh" | /usr/bin/sed 's/test-v2v-conversion-of-\(.*\).sh/\1/'`; \ echo 'script=test-v2v-conversion-of-ubuntu-16.04.sh exec $srcdir/test-v2v-conversion-of.sh' "$f" > test-v2v-conversion-of-ubuntu-16.04.sh-t chmod 0755 test-v2v-conversion-of-ubuntu-16.04.sh-t mv test-v2v-conversion-of-ubuntu-16.04.sh-t test-v2v-conversion-of-ubuntu-16.04.sh chmod 0755 test-v2v-conversion-of-ubuntu-14.04.sh-t mv test-v2v-conversion-of-ubuntu-14.04.sh-t test-v2v-conversion-of-ubuntu-14.04.sh SKIP: test-v2v-i-ova-as-root.sh SKIP: test-v2v-trim.sh SKIP: test-v2v-conversion-of-centos-7.0.sh SKIP: test-v2v-conversion-of-centos-6.sh PASS: test-v2v-of-option.sh SKIP: test-v2v-conversion-of-debian-7.sh SKIP: test-v2v-conversion-of-debian-6.sh SKIP: test-v2v-conversion-of-debian-8.sh SKIP: test-v2v-conversion-of-fedora-23.sh SKIP: test-v2v-conversion-of-fedora-20.sh SKIP: test-v2v-conversion-of-opensuse-13.1.sh SKIP: test-v2v-conversion-of-opensuse-42.1.sh SKIP: test-v2v-conversion-of-opensuse-13.2.sh SKIP: test-v2v-conversion-of-rhel-5.10.sh SKIP: test-v2v-conversion-of-rhel-6.8.sh SKIP: test-v2v-conversion-of-rhel-7.0.sh SKIP: test-v2v-conversion-of-rhel-7.2.sh SKIP: test-v2v-conversion-of-ubuntu-10.04.sh SKIP: test-v2v-conversion-of-ubuntu-12.04.sh SKIP: test-v2v-conversion-of-ubuntu-14.04.sh SKIP: test-v2v-conversion-of-ubuntu-16.04.sh PASS: test-v2v-on-option.sh PASS: test-v2v-sound.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 56 # PASS: 36 # SKIP: 20 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/v2v' Making check in v2v/test-harness make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/v2v/test-harness' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/v2v/test-harness' Making check in dib make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/dib' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/dib' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/dib' PASS: test-virt-dib-docs.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 1 # PASS: 1 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/dib' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/dib' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/dib' Making check in tools make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/tools' for f in tools/virt-list-filesystems tools/virt-list-partitions tools/virt-tar tools/virt-win-reg; do echo $f; done > ../po/POTFILES-pl make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/tools' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/tools' PASS: test-virt-list-filesystems.sh PASS: test-virt-tar.sh ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 2 # PASS: 2 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/tools' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/tools' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/tools' Making check in fuse make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' make test-fuse test-guestmount-fd test-guestunmount-fd make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' CC test_fuse-test-fuse.o CC test_guestmount_fd-test-guestmount-fd.o CC test_guestunmount_fd-test-guestunmount-fd.o CCLD test-guestunmount-fd CCLD test-fuse CCLD test-guestmount-fd make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' make check-TESTS make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' make[3]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' SKIP: test-fuse-umount-race.sh PASS: test-guestunmount-not-mounted.sh PASS: test-docs.sh SKIP: /var/tmp/tmpAS0SwB/libguestfs/fuse/.libs/lt-test-guestmount-fd PASS: /var/tmp/tmpAS0SwB/libguestfs/fuse/.libs/lt-test-guestunmount-fd PASS: /var/tmp/tmpAS0SwB/libguestfs/fuse/.libs/lt-test-fuse ===========================================================================Testsuite summary for libguestfs 1.37.20 ===========================================================================# TOTAL: 6 # PASS: 4 # SKIP: 2 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ===========================================================================make[3]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/fuse' Making check in utils/boot-analysis make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/utils/boot-analysis' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/utils/boot-analysis' Making check in utils/boot-benchmark make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/utils/boot-benchmark' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/utils/boot-benchmark' Making check in utils/qemu-boot make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/utils/qemu-boot' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/utils/qemu-boot' Making check in utils/qemu-speed-test make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/utils/qemu-speed-test' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/utils/qemu-speed-test' Making check in po-docs make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs' Making check in ja make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs/ja' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs/ja' Making check in uk make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs/uk' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs/uk' make[2]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs/po-docs' make[1]: Entering directory '/var/tmp/tmpAS0SwB/libguestfs' make[1]: Leaving directory '/var/tmp/tmpAS0SwB/libguestfs'
Richard W.M. Jones
2017-Aug-09 14:28 UTC
Re: [Libguestfs] [PATCH] build: Add a common script for generating OCaml dependencies correctly.
On Wed, Aug 09, 2017 at 03:40:54PM +0200, Pino Toscano wrote:> BTW, unrelated to this patch, just because I'm noticing them: what are > all the "docs" dependencies in .PHONY? At least for newer Makefile's > I guess they were just copied from existing ones, but I did not find > any reference/reason for the ones in older tools. Do you remember more > about them?I'm guessing they are left over from something and no longer used/useful. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v
Possibly Parallel Threads
- [PATCH] build: Add a common script for generating OCaml dependencies correctly.
- [PATCH v6 10/41] mllib, v2v: Split out OCaml utils bindings ‘common/mlutils’.
- [PATCH] Fix out-of-tree builds of OCaml components
- [common PATCH] mlv2v: build as OCaml library
- [PATCH] Fix out-of-tree builds of OCaml components