Menu
▾
▴
[Valgrind-developers] valgrind: r10352 - in trunk/drd: . scripts
|
From: <sv...@va...> - 2009-06-20 10:56:52
|
Author: bart
Date: 2009-06-20 11:56:45 +0100 (Sat, 20 Jun 2009)
New Revision: 10352
Log:
Updated test plan.
Removed:
trunk/drd/scripts/add-libjemalloc-support
Modified:
trunk/drd/Testing.txt
trunk/drd/scripts/download-and-build-firefox
Modified: trunk/drd/Testing.txt
===================================================================
--- trunk/drd/Testing.txt 2009-06-20 10:55:12 UTC (rev 10351)
+++ trunk/drd/Testing.txt 2009-06-20 10:56:45 UTC (rev 10352)
@@ -66,16 +66,11 @@
cvs -d :pserver:ano...@cv...:/GraphicsMagick login
cvs -d :pserver:ano...@cv...:/GraphicsMagick co GraphicsMagick
cd GraphicsMagick
- ./configure --prefix=$HOME/GraphicsMagick-cvs
- vi Makefile # Add --check-stack-var=yes and --var-info=yes to the
- # drd: target.
+ ./configure
export OMP_NUM_THREADS=4
- make -s drd
+ make -j2 -s MEMCHECK="$HOME/software/valgrind/vg-in-place --tool=drd --check-stack-var=yes --var-info=yes --quiet" check
-12. Test DRD with Firefox. First of all, make sure that Valgrind is patched
- such that it supports libjemalloc.so:
- drd/scripts/add-libjemalloc-support
- Next, build and install Firefox 3:
+12. Test DRD with Firefox. First build and install Firefox 3:
drd/scripts/download-and-build-firefox
Now run the following command:
- LD_LIBRARY_PATH=$HOME/software/mozilla-build/dist/lib: ./vg-in-place --tool=drd --check-stack-var=yes --trace-children=yes $HOME/software/mozilla-build/dist/bin/firefox-bin
+ LD_LIBRARY_PATH=$HOME/software/mozilla-build/dist/lib: ./vg-in-place --tool=drd --check-stack-var=yes --trace-children=yes --show-confl-seg=no $HOME/software/mozilla-build/dist/bin/firefox-bin
Deleted: trunk/drd/scripts/add-libjemalloc-support
===================================================================
--- trunk/drd/scripts/add-libjemalloc-support 2009-06-20 10:55:12 UTC (rev 10351)
+++ trunk/drd/scripts/add-libjemalloc-support 2009-06-20 10:56:45 UTC (rev 10352)
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-if [ ! -e coregrind/m_replacemalloc/vg_replace_malloc.c ]; then
- echo "Error: please start this script from the Valgrind source directory."
- exit 1
-fi
-
-if grep -q -w libjemallocZdsoZa coregrind/m_replacemalloc/vg_replace_malloc.c;
-then
- echo "The libjemalloc patch is already present."
- exit 0
-fi
-
-{ cat <<'EOF' | patch -p0; } || exit $?
-Index: coregrind/m_replacemalloc/vg_replace_malloc.c
-===================================================================
---- coregrind/m_replacemalloc/vg_replace_malloc.c (revision 7759)
-+++ coregrind/m_replacemalloc/vg_replace_malloc.c (revision 7778)
-@@ -68,6 +68,10 @@
- # error "Unknown platform"
- #endif
-
-+/* --- Soname of libjemalloc. --- */
-+
-+#define m_jemalloc_soname libjemallocZdsoZa /* libjemalloc.so* */
-+
- /* --- Soname of the GNU C++ library. --- */
-
- #define m_libstdcxx_soname libstdcZpZpZa // libstdc++*
-@@ -203,6 +207,7 @@
- // (from_so, from_fn, v's replacement)
-
- // malloc
-+ALLOC_or_NULL(m_jemalloc_soname, malloc, malloc);
- ALLOC_or_NULL(m_libstdcxx_soname, malloc, malloc);
- ALLOC_or_NULL(m_libc_soname, malloc, malloc);
- #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
-@@ -319,6 +324,7 @@
- }
-
- // free
-+FREE(m_jemalloc_soname, free, free );
- FREE(m_libstdcxx_soname, free, free );
- FREE(m_libc_soname, free, free );
- #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
-@@ -394,6 +400,7 @@
- return v; \
- }
-
-+CALLOC(m_jemalloc_soname, calloc);
- CALLOC(m_libc_soname, calloc);
- #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
- CALLOC(m_libc_soname, calloc_common);
-@@ -426,6 +433,7 @@
- return v; \
- }
-
-+REALLOC(m_jemalloc_soname, realloc);
- REALLOC(m_libc_soname, realloc);
- #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
- REALLOC(m_libc_soname, realloc_common);
-@@ -457,6 +465,7 @@
- return v; \
- }
-
-+MEMALIGN(m_jemalloc_soname, memalign);
- MEMALIGN(m_libc_soname, memalign);
-
-
-@@ -483,6 +492,7 @@
- ((SizeT)pszB, size); \
- }
-
-+VALLOC(m_jemalloc_soname, valloc);
- VALLOC(m_libc_soname, valloc);
-
-
-@@ -566,6 +576,7 @@
- return VKI_ENOMEM; \
- }
-
-+POSIX_MEMALIGN(m_jemalloc_soname, posix_memalign);
- POSIX_MEMALIGN(m_libc_soname, posix_memalign);
- #if defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
- /* 27 Nov 07: it appears that xlc links into executables, a
-@@ -596,6 +607,7 @@
- return pszB; \
- }
-
-+MALLOC_USABLE_SIZE(m_jemalloc_soname, malloc_usable_size);
- MALLOC_USABLE_SIZE(m_libc_soname, malloc_usable_size);
-
-
-EOF
-
-make -s
Modified: trunk/drd/scripts/download-and-build-firefox
===================================================================
--- trunk/drd/scripts/download-and-build-firefox 2009-06-20 10:55:12 UTC (rev 10351)
+++ trunk/drd/scripts/download-and-build-firefox 2009-06-20 10:56:45 UTC (rev 10352)
@@ -24,6 +24,11 @@
exit 1
fi
+if [ ! -e /usr/include/valgrind/valgrind.h ]; then
+ echo "Please install the valgrind-devel package first."
+ exit 1
+fi
+
rm -rf ${BUILD} || exit $?
rm -rf ${PREFIX} || exit $?
mkdir -p ${DOWNLOADS} || exit $?
@@ -45,13 +50,13 @@
ac_add_options --disable-optimize
ac_add_options --disable-tests
ac_add_options --enable-debug
+ac_add_options --enable-optimize="-O1 -g -pipe"
ac_add_options --enable-static
ac_add_options --prefix $PREFIX
-ac_add_options --enable-optimize="-O1 -g -pipe"
+ac_add_options --with-valgrind
EOF
-# Note: apparently Firefox 3.0 doesn't compile with gcc 4.3.
-CC=~/gcc-4.2.4/bin/gcc CXX=~/gcc-4.2.4/bin/g++ ${SRC}/configure
+${SRC}/configure
make -s -j2 || exit $?
# make -s install || exit $?
|
