mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
As lcov module is not installed with GD.pm dependency we need
to check for presence of this module and avoid using --frames option for genhtml in this case. Fix arg list for AC_PATH_PROG for lcov and genhtml. (detecting empty LCOV and GENHTML string in Makefiles).
This commit is contained in:
parent
e83968fa28
commit
fd4728e194
@ -112,7 +112,7 @@ lcov: $(LCOV_TRACES)
|
||||
for i in $(LCOV_TRACES); do \
|
||||
test -s $$i && lc="$$lc $$i"; \
|
||||
done; \
|
||||
test -z "$$lc" || $(GENHTML) --frames -p @abs_top_builddir@ \
|
||||
test -z "$$lc" || $(GENHTML) -p @abs_top_builddir@ \
|
||||
-o $(LCOV_REPORTS_DIR) $$lc
|
||||
endif
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
Version 2.02.63 -
|
||||
================================
|
||||
Fix lcov rules and generate better coverage report.
|
||||
Improve vg_validate to detect some loops in lists.
|
||||
Change most remaining log_error WARNING messages to log_warn.
|
||||
Always use blocking lock for VGs and orphan locks.
|
||||
|
60
configure
vendored
60
configure
vendored
@ -704,6 +704,7 @@ MODPROBE_CMD
|
||||
MSGFMT
|
||||
LVM2CMD_LIB
|
||||
LVM2APP_LIB
|
||||
GENPNG
|
||||
GENHTML
|
||||
LCOV
|
||||
SACKPT_LIBS
|
||||
@ -12114,7 +12115,6 @@ done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_LCOV" && ac_cv_path_LCOV="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -12155,7 +12155,6 @@ done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_GENHTML" && ac_cv_path_GENHTML="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -12169,11 +12168,66 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "$LCOV" = no -o "$GENHTML" = no ; then
|
||||
if test -z "$LCOV" -o -z "$GENHTML"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: lcov and genhtml are required for profiling" >&5
|
||||
$as_echo "$as_me: error: lcov and genhtml are required for profiling" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
# Extract the first word of "genpng", so it can be a program name with args.
|
||||
set dummy genpng; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_GENPNG+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $GENPNG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_GENPNG="$GENPNG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_GENPNG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
GENPNG=$ac_cv_path_GENPNG
|
||||
if test -n "$GENPNG"; then
|
||||
{ $as_echo "$as_me:$LINENO: result: $GENPNG" >&5
|
||||
$as_echo "$GENPNG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$GENPNG"; then
|
||||
{ $as_echo "$as_me:$LINENO: checking whether $GENPNG has all required modules" >&5
|
||||
$as_echo_n "checking whether $GENPNG has all required modules... " >&6; }
|
||||
if $GENPNG --help > /dev/null 2>&1 ; then
|
||||
{ $as_echo "$as_me:$LINENO: result: ok" >&5
|
||||
$as_echo "ok" >&6; }
|
||||
GENHTML="$GENHTML --frames"
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: not supported" >&5
|
||||
$as_echo "not supported" >&6; }
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: GD.pm perl module is not installed" >&5
|
||||
$as_echo "$as_me: WARNING: GD.pm perl module is not installed" >&2;}
|
||||
GENPNG=
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
|
18
configure.in
18
configure.in
@ -624,11 +624,23 @@ AC_MSG_RESULT($PROFILING)
|
||||
|
||||
if test "x$PROFILING" = xyes; then
|
||||
COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage"
|
||||
AC_PATH_PROG(LCOV, lcov, no)
|
||||
AC_PATH_PROG(GENHTML, genhtml, no)
|
||||
if test "$LCOV" = no -o "$GENHTML" = no ; then
|
||||
AC_PATH_PROG(LCOV, lcov)
|
||||
AC_PATH_PROG(GENHTML, genhtml)
|
||||
if test -z "$LCOV" -o -z "$GENHTML"; then
|
||||
AC_MSG_ERROR([lcov and genhtml are required for profiling])
|
||||
fi
|
||||
AC_PATH_PROG(GENPNG, genpng)
|
||||
if test -n "$GENPNG"; then
|
||||
AC_MSG_CHECKING([whether $GENPNG has all required modules])
|
||||
if $GENPNG --help > /dev/null 2>&1 ; then
|
||||
AC_MSG_RESULT(ok)
|
||||
GENHTML="$GENHTML --frames"
|
||||
else
|
||||
AC_MSG_RESULT(not supported)
|
||||
AC_MSG_WARN([GD.pm perl module is not installed])
|
||||
GENPNG=
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
|
Loading…
Reference in New Issue
Block a user