|
From: <sv...@va...> - 2009-02-12 00:30:09
|
Author: njn Date: 2009-02-12 00:30:02 +0000 (Thu, 12 Feb 2009) New Revision: 9141 Log: Merge the non-Darwin parts of r9140 (install vgpreload .dSYMs), just to keep the trunk and DARWIN branch in sync. Modified: trunk/Makefile.install.am trunk/Makefile.tool.am trunk/coregrind/Makefile.am trunk/memcheck/tests/filter_xml trunk/tests/filter_stderr_basic Modified: trunk/Makefile.install.am =================================================================== --- trunk/Makefile.install.am 2009-02-11 23:21:06 UTC (rev 9140) +++ trunk/Makefile.install.am 2009-02-12 00:30:02 UTC (rev 9141) @@ -1,9 +1,10 @@ # This is used by coregrind/Makefile.am and Makefile.tool.am for doing # "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir. -all-local: +# It needs to be depended on by an 'all-local' rule. +inplace-noinst_PROGRAMS: if [ -n "$(noinst_PROGRAMS)" ] ; then \ - for f in $(noinst_PROGRAMS); do \ - mkdir -p $(inplacedir); \ + mkdir -p $(inplacedir); \ + for f in $(noinst_PROGRAMS) ; do \ rm -f $(inplacedir)/$$f; \ ln -f -s ../$(subdir)/$$f $(inplacedir); \ done ; \ @@ -12,10 +13,10 @@ # This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing # "make install". It copies $(noinst_PROGRAMS) into $prefix/lib/valgrind/. # It needs to be depended on by an 'install-exec-local' rule. -install-exec-local-programs: +install-noinst_PROGRAMS: if [ -n "$(noinst_PROGRAMS)" ] ; then \ + $(mkinstalldirs) $(DESTDIR)$(valdir); \ for f in $(noinst_PROGRAMS); do \ - $(mkinstalldirs) $(DESTDIR)$(valdir); \ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir); \ done ; \ fi Modified: trunk/Makefile.tool.am =================================================================== --- trunk/Makefile.tool.am 2009-02-11 23:21:06 UTC (rev 9140) +++ trunk/Makefile.tool.am 2009-02-12 00:30:02 UTC (rev 9141) @@ -154,4 +154,7 @@ $(LIBREPLACEMALLOC_PPC64_AIX5) -install-exec-local: install-exec-local-programs +all-local: inplace-noinst_PROGRAMS + +install-exec-local: install-noinst_PROGRAMS + Modified: trunk/coregrind/Makefile.am =================================================================== --- trunk/coregrind/Makefile.am 2009-02-11 23:21:06 UTC (rev 9140) +++ trunk/coregrind/Makefile.am 2009-02-12 00:30:02 UTC (rev 9141) @@ -407,12 +407,14 @@ vgpreload_core_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) vgpreload_core_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5) +all-local: inplace-noinst_PROGRAMS + clean-local: $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" clean # Nb: The loop installs the libvex library for possible use by standalone # tools. -install-exec-local: install-exec-local-programs +install-exec-local: install-noinst_PROGRAMS for v in $(LIBVEX) ; do \ $(INSTALL_DATA) @VEX_DIR@/$$v $(DESTDIR)$(valdir) ; \ done Modified: trunk/memcheck/tests/filter_xml =================================================================== --- trunk/memcheck/tests/filter_xml 2009-02-11 23:21:06 UTC (rev 9140) +++ trunk/memcheck/tests/filter_xml 2009-02-12 00:30:02 UTC (rev 9141) @@ -23,6 +23,7 @@ # # The other is that as somebody else said you need to change the input # record separator so that it reads in the whole file as a single line -# which you can do with the -0 switch. +# (which means we can do multi-line matching in a single regexp) which you +# can do with the -0 switch. # # Hence -0 -p. Modified: trunk/tests/filter_stderr_basic =================================================================== --- trunk/tests/filter_stderr_basic 2009-02-11 23:21:06 UTC (rev 9140) +++ trunk/tests/filter_stderr_basic 2009-02-12 00:30:02 UTC (rev 9141) @@ -28,9 +28,6 @@ # Anonymise line numbers in vg_replace_malloc.c, remove dirname if present sed "s/\(m_replacemalloc\/\)\?vg_replace_malloc.c:[0-9]*/vg_replace_malloc.c:.../" | -# Anonymise vg_intercept lines -#sed "s/vg_intercept.c:[0-9]*/vg_intercept.c:.../" | - # Hide suppressed error counts sed "s/^\(ERROR SUMMARY[^(]*(suppressed: \)[0-9]*\( from \)[0-9]*)$/\10\20)/" | |