Merge the non-Darwin parts of r9140 (install vgpreload .dSYMs), just to keep

the trunk and DARWIN branch in sync.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9141

diff --git a/Makefile.install.am b/Makefile.install.am
index 1f02b6e37d7526ec0cecd16a7e08c764ea767ed3..c797ee7139aeba0798e3ab968e9a633523b53f5d 100644 (file)
--- a/Makefile.install.am
+++ b/Makefile.install.am
@@ -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 @@ all-local:
 # 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

diff --git a/Makefile.tool.am b/Makefile.tool.am
index 85e5cf522ecc1f334f9bc6ab8b95d5d5f6aa0a68..6bcbfedc093b287ead54ecc51f166e4ec5fbb695 100644 (file)
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -154,4 +154,7 @@ LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5 = \
        $(LIBREPLACEMALLOC_PPC64_AIX5)
 
 
-install-exec-local: install-exec-local-programs
+all-local: inplace-noinst_PROGRAMS
+
+install-exec-local: install-noinst_PROGRAMS
+

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index e4dddf16c51aece7b9d3764a82e8acd5226a4dac..4a7bc5abbc3e33aeba323af3b5662692ca476add 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -407,12 +407,14 @@ vgpreload_core_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
 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

diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index 13ce0e13aa4630b1bf4c3ab0ab87ebc9458d613a..72caf1db0912b3c4fb3f3900c8c9d8a473dba587 100755 (executable)
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -23,6 +23,7 @@ perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s"
 # 
 # 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.

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index 16194fc4cb0745feaacbf588a917cd908446a5df..90a660a8bff7fc369e56685e95ea6e2fa2fab4aa 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -28,9 +28,6 @@ sed "/For more details, rerun with: -v/d"                             |
 # 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)/" |