Richard W.M. Jones
2014-Apr-09 09:22 UTC
[Libguestfs] [PATCH] build: Remove code coverage and code profiling options.
This reverts commit 5a2e320ec9390b2146feea6d7b3b8c36a34d0a90.
---
.gitignore | 4 ----
align/Makefile.am | 1 -
builder/Makefile.am | 2 --
cat/Makefile.am | 3 ---
configure.ac | 24 ------------------------
customize/Makefile.am | 2 --
df/Makefile.am | 1 -
diff/Makefile.am | 1 -
edit/Makefile.am | 1 -
erlang/Makefile.am | 3 +--
examples/Makefile.am | 24 ++++++++----------------
fish/Makefile.am | 1 -
format/Makefile.am | 1 -
fuse/Makefile.am | 7 ++-----
inspector/Makefile.am | 1 -
make-fs/Makefile.am | 1 -
mllib/Makefile.am | 2 --
rescue/Makefile.am | 1 -
resize/Makefile.am | 2 --
src/Makefile.am | 4 +---
sysprep/Makefile.am | 2 --
test-tool/Makefile.am | 3 +--
tests/c-api/Makefile.am | 40 +++++++++++++---------------------------
tests/charsets/Makefile.am | 3 +--
tests/events/Makefile.am | 1 -
tests/mount-local/Makefile.am | 1 -
tests/mountable/Makefile.am | 3 +--
tests/parallel/Makefile.am | 3 +--
tests/regressions/Makefile.am | 12 ++++--------
29 files changed, 33 insertions(+), 121 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3e6a084..4d47d23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,6 @@
*.cmxa
*.diff
*.eml
-*.gcda
-*.gcno
-*.gcov
*.hi
*.jar
*.la
@@ -26,7 +23,6 @@ bindtests.tmp
cscope.out
.deps
.gdb_history
-gmon.out
.libs
Makefile
Makefile.in
diff --git a/align/Makefile.am b/align/Makefile.am
index b243823..4ecbf7e 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -58,7 +58,6 @@ virt_alignment_scan_CPPFLAGS = \
virt_alignment_scan_CFLAGS = \
-pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
diff --git a/builder/Makefile.am b/builder/Makefile.am
index 851e3a6..7d399d4 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -165,7 +165,6 @@ virt-builder: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
else
virt-builder: $(OBJECTS)
@@ -173,7 +172,6 @@ virt-builder: $(OBJECTS)
mlguestfs.cma -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
-custom \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
endif
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 2db4997..ac045aa 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -51,7 +51,6 @@ virt_cat_CPPFLAGS = \
virt_cat_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_cat_LDADD = \
@@ -74,7 +73,6 @@ virt_filesystems_CPPFLAGS = \
virt_filesystems_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_filesystems_LDADD = \
@@ -99,7 +97,6 @@ virt_ls_CPPFLAGS = \
virt_ls_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_ls_LDADD = \
diff --git a/configure.ac b/configure.ac
index f48a8d6..f3e8556 100644
--- a/configure.ac
+++ b/configure.ac
@@ -998,30 +998,6 @@ AS_IF([test "x$VALGRIND" != "xno"],[
AC_SUBST([VG])
AM_SUBST_NOTMAKE([VG])
-dnl Enable profiling?
-AC_ARG_ENABLE([code-profiling],
- AS_HELP_STRING([--enable-code-profiling], [enable code profiling]),
- [],
- [enable_code_profiling=no])
-AS_IF([test "x$enable_code_profiling" != "xno"],[
- GPROF_CFLAGS="-pg"
- AC_SUBST([GPROF_CFLAGS])
-])
-
-dnl Enable code coverage?
-AC_ARG_ENABLE([code-coverage],
- AS_HELP_STRING([--enable-code-coverage], [enable code coverage]),
- [],
- [enable_code_coverage=no])
-AS_IF([test "x$enable_code_coverage" != "xno"],[
- GCOV_CFLAGS="-fprofile-arcs -ftest-coverage"
- AC_SUBST([GCOV_CFLAGS])
- dnl This is a hack to make OCaml programs work when they
- dnl link to C code that is compiled with gcov flags.
- OCAML_GCOV_LDFLAGS="-cclib -lgcov"
- AC_SUBST([OCAML_GCOV_LDFLAGS])
-])
-
dnl Check for OCaml (optional, for OCaml bindings and OCaml tools).
OCAMLC=no
OCAMLFIND=no
diff --git a/customize/Makefile.am b/customize/Makefile.am
index ae1e007..80fceb3 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -122,14 +122,12 @@ if HAVE_OCAMLOPT
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
else
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
mlguestfs.cma -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
-custom \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
endif
diff --git a/df/Makefile.am b/df/Makefile.am
index 38a628c..29e0bf5 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -61,7 +61,6 @@ virt_df_CPPFLAGS = \
virt_df_CFLAGS = \
-pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
diff --git a/diff/Makefile.am b/diff/Makefile.am
index 5b38e21..3c2c211 100644
--- a/diff/Makefile.am
+++ b/diff/Makefile.am
@@ -49,7 +49,6 @@ virt_diff_CPPFLAGS = \
virt_diff_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_diff_LDADD = \
diff --git a/edit/Makefile.am b/edit/Makefile.am
index dbaad6c..1d51095 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -48,7 +48,6 @@ virt_edit_CPPFLAGS = \
virt_edit_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS)
diff --git a/erlang/Makefile.am b/erlang/Makefile.am
index 7ac24f2..c68641c 100644
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -61,8 +61,7 @@ erl_guestfs_CPPFLAGS = \
-I$(ERLANG_LIB_DIR_erl_interface)/include
erl_guestfs_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
erl_guestfs_LDADD = \
$(ERLANG_LIB_DIR_erl_interface)/lib/liberl_interface.a \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c2606bd..e150a58 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -59,8 +59,7 @@ copy_over_CPPFLAGS = \
copy_over_CFLAGS = \
$(LIBVIRT_CFLAGS) \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
copy_over_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(LIBVIRT_LIBS)
@@ -72,8 +71,7 @@ libvirt_auth_CPPFLAGS = \
libvirt_auth_CFLAGS = \
$(LIBVIRT_CFLAGS) \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
libvirt_auth_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(LIBVIRT_LIBS)
@@ -84,8 +82,7 @@ create_disk_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src
create_disk_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
create_disk_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -94,8 +91,7 @@ debug_logging_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src
debug_logging_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
debug_logging_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -104,8 +100,7 @@ display_icon_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src
display_icon_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
display_icon_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -114,8 +109,7 @@ inspect_vm_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src
inspect_vm_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
inspect_vm_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -128,8 +122,7 @@ mount_local_CFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(FUSE_CFLAGS) \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
mount_local_LDADD = \
$(FUSE_LIBS) \
$(top_builddir)/src/libguestfs.la
@@ -141,8 +134,7 @@ virt_dhcp_address_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src
virt_dhcp_address_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
virt_dhcp_address_LDADD = \
$(top_builddir)/src/libguestfs.la
endif
diff --git a/fish/Makefile.am b/fish/Makefile.am
index c39c968..ad984ec 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -133,7 +133,6 @@ guestfish_CPPFLAGS = \
guestfish_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS)
diff --git a/format/Makefile.am b/format/Makefile.am
index c93edc9..178c391 100644
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -47,7 +47,6 @@ virt_format_CPPFLAGS = \
virt_format_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 2797e51..3fd64a2 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -61,7 +61,6 @@ guestmount_CPPFLAGS = \
guestmount_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(FUSE_CFLAGS)
@@ -86,8 +85,7 @@ guestunmount_CPPFLAGS = \
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
guestunmount_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
guestunmount_LDADD = \
$(top_builddir)/src/libutils.la \
@@ -151,8 +149,7 @@ test_guestunmount_fd_CPPFLAGS = \
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
test_guestunmount_fd_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_guestunmount_fd_LDADD = \
$(top_builddir)/src/libutils.la \
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 8738abc..86e0cd7 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -75,7 +75,6 @@ virt_inspector_CPPFLAGS = \
virt_inspector_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBCONFIG_CFLAGS)
diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am
index d318468..03e30ba 100644
--- a/make-fs/Makefile.am
+++ b/make-fs/Makefile.am
@@ -44,7 +44,6 @@ virt_make_fs_CPPFLAGS = \
virt_make_fs_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_make_fs_LDADD = \
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index fe215f8..72a032c 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -101,14 +101,12 @@ if HAVE_OCAMLOPT
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
else
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
mlguestfs.cma -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
-custom \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
endif
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index c2a9b9e..6a5e175 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -49,7 +49,6 @@ virt_rescue_CPPFLAGS = \
virt_rescue_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS)
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 67cb8c9..4b049ab 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -80,7 +80,6 @@ virt-resize: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
else
virt-resize: $(OBJECTS)
@@ -88,7 +87,6 @@ virt-resize: $(OBJECTS)
mlguestfs.cma -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
-custom \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index e861467..3d06203 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,7 +139,6 @@ libguestfs_la_CPPFLAGS = \
libguestfs_la_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(GCC_VISIBILITY_HIDDEN) \
$(PCRE_CFLAGS) \
$(LIBVIRT_CFLAGS) \
@@ -262,8 +261,7 @@ test_utils_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
-I$(top_srcdir)/src -I.
test_utils_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_utils_LDADD = \
libguestfs_la-guid.lo \
libutils.la \
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index f555d6b..cc411cc 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -138,7 +138,6 @@ virt-sysprep: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
else
virt-sysprep: $(OBJECTS)
@@ -146,7 +145,6 @@ virt-sysprep: $(OBJECTS)
mlguestfs.cma -linkpkg $^ \
-cclib '$(OCAMLCLIBS)' \
-custom \
- $(OCAML_GCOV_LDFLAGS) \
-o $@
endif
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index 21e411d..c0e958c 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -33,8 +33,7 @@ libguestfs_test_tool_CPPFLAGS = \
-DLOCALEBASEDIR=\""$(datadir)/locale"\"
libguestfs_test_tool_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
libguestfs_test_tool_LDADD = \
$(top_builddir)/src/libguestfs.la \
diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am
index 3df00b1..6ea22e9 100644
--- a/tests/c-api/Makefile.am
+++ b/tests/c-api/Makefile.am
@@ -83,7 +83,6 @@ tests_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
tests_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(PCRE_CFLAGS)
tests_LDADD = \
$(PCRE_LIBS) \
@@ -108,8 +107,7 @@ test_just_header_SOURCES = test-just-header.c
test_just_header_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_just_header_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_just_header_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -118,8 +116,7 @@ test_just_header_cxx_SOURCES = test-just-header-cxx.cpp
test_just_header_cxx_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_just_header_cxx_CXXFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_just_header_cxx_LDADD = \
$(top_builddir)/src/libguestfs.la
endif
@@ -128,8 +125,7 @@ test_create_handle_SOURCES = test-create-handle.c
test_create_handle_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_create_handle_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_create_handle_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -137,8 +133,7 @@ test_config_SOURCES = test-config.c
test_config_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_config_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_config_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -146,8 +141,7 @@ test_add_drive_opts_SOURCES = test-add-drive-opts.c
test_add_drive_opts_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_add_drive_opts_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_add_drive_opts_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -156,8 +150,7 @@ test_last_errno_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_last_errno_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_last_errno_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
@@ -166,8 +159,7 @@ test_backend_settings_SOURCES = test-backend-settings.c
test_backend_settings_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_backend_settings_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_backend_settings_LDADD = \
$(top_builddir)/src/libutils_la-utils.lo \
$(top_builddir)/src/libguestfs.la
@@ -176,8 +168,7 @@ test_private_data_SOURCES = test-private-data.c
test_private_data_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_private_data_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_private_data_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -187,8 +178,7 @@ test_user_cancel_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_user_cancel_CFLAGS = \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_user_cancel_LDADD = \
$(top_builddir)/src/libguestfs.la -lm \
$(top_builddir)/gnulib/lib/libgnu.la
@@ -199,8 +189,7 @@ test_debug_to_file_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib
test_debug_to_file_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_debug_to_file_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
@@ -211,8 +200,7 @@ test_environment_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib
test_environment_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_environment_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
@@ -223,8 +211,7 @@ test_event_string_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib
test_event_string_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_event_string_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
@@ -235,8 +222,7 @@ test_event_string_LDADD = \
# -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/gnulib/lib
#test_add_libvirt_dom_CFLAGS = \
# $(LIBVIRT_CFLAGS) \
-# $(WARN_CFLAGS) $(WERROR_CFLAGS) \
-# $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+# $(WARN_CFLAGS) $(WERROR_CFLAGS)
#test_add_libvirt_dom_LDADD = \
# $(top_builddir)/src/libguestfs.la $(LIBVIRT_LIBS) \
# $(LTLIBTHREAD) $(top_builddir)/gnulib/lib/libgnu.la
diff --git a/tests/charsets/Makefile.am b/tests/charsets/Makefile.am
index 5a94255..b7ec703 100644
--- a/tests/charsets/Makefile.am
+++ b/tests/charsets/Makefile.am
@@ -28,8 +28,7 @@ test_charset_fidelity_SOURCES = test-charset-fidelity.c
test_charset_fidelity_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_charset_fidelity_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_charset_fidelity_LDADD = \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
diff --git a/tests/events/Makefile.am b/tests/events/Makefile.am
index 9751edc..9f31e9e 100644
--- a/tests/events/Makefile.am
+++ b/tests/events/Makefile.am
@@ -37,7 +37,6 @@ test_libvirt_auth_callbacks_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_libvirt_auth_callbacks_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(LIBVIRT_CFLAGS)
test_libvirt_auth_callbacks_LDADD = \
$(top_builddir)/src/libutils.la \
diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am
index 3506cac..17cfa73 100644
--- a/tests/mount-local/Makefile.am
+++ b/tests/mount-local/Makefile.am
@@ -37,7 +37,6 @@ test_parallel_mount_local_CPPFLAGS = \
test_parallel_mount_local_CFLAGS = \
-pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS) \
$(FUSE_CFLAGS)
test_parallel_mount_local_LDADD = \
$(FUSE_LIBS) \
diff --git a/tests/mountable/Makefile.am b/tests/mountable/Makefile.am
index f7824f5..0e2cedd 100644
--- a/tests/mountable/Makefile.am
+++ b/tests/mountable/Makefile.am
@@ -32,8 +32,7 @@ test_internal_parse_mountable_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_internal_parse_mountable_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_internal_parse_mountable_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
diff --git a/tests/parallel/Makefile.am b/tests/parallel/Makefile.am
index f4e0e7c..be63256 100644
--- a/tests/parallel/Makefile.am
+++ b/tests/parallel/Makefile.am
@@ -32,8 +32,7 @@ test_parallel_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
test_parallel_CFLAGS = \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
test_parallel_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(top_builddir)/gnulib/lib/libgnu.la
diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
index 8016e2f..ac7da56 100644
--- a/tests/regressions/Makefile.am
+++ b/tests/regressions/Makefile.am
@@ -88,8 +88,7 @@ rhbz501893_SOURCES = rhbz501893.c
rhbz501893_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
rhbz501893_CFLAGS = \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
rhbz501893_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -98,8 +97,7 @@ rhbz790721_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src
rhbz790721_CFLAGS = \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
rhbz790721_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -109,8 +107,7 @@ rhbz914931_CPPFLAGS = \
-DGUESTFS_PRIVATE=1
rhbz914931_CFLAGS = \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
rhbz914931_LDADD = \
$(top_builddir)/src/libguestfs.la
@@ -120,8 +117,7 @@ rhbz1055452_CPPFLAGS = \
-DGUESTFS_PRIVATE=1
rhbz1055452_CFLAGS = \
-pthread \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(GPROF_CFLAGS) $(GCOV_CFLAGS)
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
rhbz1055452_LDADD = \
$(top_builddir)/src/libguestfs.la
--
1.8.5.3
Pino Toscano
2014-Apr-09 13:16 UTC
Re: [Libguestfs] [PATCH] build: Remove code coverage and code profiling options.
On Wednesday 09 April 2014 10:22:35 Richard W.M. Jones wrote:> This reverts commit 5a2e320ec9390b2146feea6d7b3b8c36a34d0a90.Reading also the log of the above-mentioned commit, sounds like removing them won't cause issues nor regressions. So ACK IMHO. -- Pino Toscano