good for merge On Thu, 2010-03-18 at 09:01 +1100, Angus Salkeld wrote: > Currently code coverage only works on non-dlopen'ed > code, this fixes that. > > -Angus > > Signed-off-by: Angus Salkeld <[email protected]> > --- > configure.ac | 4 +++- > exec/Makefile.am | 2 +- > services/Makefile.am | 2 +- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 6069286..a9952e4 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -387,10 +387,12 @@ if test "x${enable_coverage}" = xyes && \ > OPT_CFLAGS="-O0" > COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs" > COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" > + COVERAGE_LCRSO_EXTRA_LDFLAGS="-rdynamic" > PACKAGE_FEATURES="$PACKAGE_FEATURES coverage" > else > COVERAGE_CFLAGS="" > COVERAGE_LDFLAGS="" > + COVERAGE_LCRSO_EXTRA_LDFLAGS="" > fi > > > @@ -433,7 +435,7 @@ AC_SUBST([SOMINOR]) > AC_SUBST([SOMICRO]) > AC_SUBST([SONAME]) > AC_SUBST([CPG_SONAME]) > - > +AC_SUBST([COVERAGE_LCRSO_EXTRA_LDFLAGS]) > AC_SUBST([OS_DYFLAGS]) > > AC_SUBST([OS_LDL]) > diff --git a/exec/Makefile.am b/exec/Makefile.am > index fe054ca..f367f29 100644 > --- a/exec/Makefile.am > +++ b/exec/Makefile.am > @@ -122,7 +122,7 @@ libcoroipcs.so.$(SONAME): $(COROIPCS_OBJS) > else > > %.lcrso: %.o > - $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ > + $(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ > $^ -o $@ > > libtotem_pg.so.$(SONAME): $(TOTEM_OBJS) > $(CC) -shared -o $@ \ > diff --git a/services/Makefile.am b/services/Makefile.am > index 06365db..5b284ed 100644 > --- a/services/Makefile.am > +++ b/services/Makefile.am > @@ -71,7 +71,7 @@ quorum_%.lcrso: %.o > $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ > > service_%.lcrso: %.o > - $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ > + $(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ > $^ -o $@ > endif > > endif
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
