svn commit: samba r26560 - in branches/SAMBA_4_0: . source source/script source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-22 00:47:44 +0000 (Sat, 22 Dec 2007)
New Revision: 26560

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26560

Log:
Add script for running in valgrind.
Added:
   branches/SAMBA_4_0/source/script/valgrind_run
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/selftest/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2007-12-22 00:47:36 UTC (rev 26559)
+++ branches/SAMBA_4_0/source/main.mk	2007-12-22 00:47:44 UTC (rev 26560)
@@ -43,6 +43,8 @@
 all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods
 everything: all libraries headers
 
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
+
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm
 # scripts use that it as fallback in case

Added: branches/SAMBA_4_0/source/script/valgrind_run
===================================================================
--- branches/SAMBA_4_0/source/script/valgrind_run	2007-12-22 00:47:36 UTC (rev 26559)
+++ branches/SAMBA_4_0/source/script/valgrind_run	2007-12-22 00:47:44 UTC (rev 26560)
@@ -0,0 +1,2 @@
+#!/bin/sh
+valgrind -q --db-attach=yes --num-callers=30 $@

Modified: branches/SAMBA_4_0/source/selftest/config.mk
===================================================================
--- branches/SAMBA_4_0/source/selftest/config.mk	2007-12-22 00:47:36 UTC (rev 26559)
+++ branches/SAMBA_4_0/source/selftest/config.mk	2007-12-22 00:47:44 UTC (rev 26560)
@@ -1,6 +1,6 @@
 TEST_FORMAT = plain
 
-SELFTEST = $(LIB_PATH_VAR)=$(builddir)/bin/shared $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/samba4-knownfail \
 	--format=$(TEST_FORMAT) \
@@ -37,17 +37,17 @@
 valgrindtest: valgrindtest-all
 
 valgrindtest-quick: all
-	SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-all: everything
-	SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-env: everything
-	SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
+	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
 	$(SELFTEST) --socket-wrapper --testenv