sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r26561: Fix make gdbtest, valgrindtest and testenv for shared libs.

Browse Source 
(This used to be commit d2b9055bc032506849827d6fab2d2b9d35d132e2)
This commit is contained in:
Jelmer Vernooij 2007-12-22 00:47:48 -06:00 committed by Stefan Metzmacher
parent 6915cad127
commit af7e3dadf9
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/script/gdb_run
View File

@ -1,5 +1,9 @@
#!/bin/sh
ENV="$1"
shift 1
if test -z "$TMPDIR"; then
TMPDIR="/tmp"
fi
@ -13,4 +17,4 @@ EOF
trap "/bin/rm -f $TMPFILE" EXIT
CMD="gdb -x $TMPFILE --args $@"
echo $CMD
eval "$CMD"
eval $ENV "$CMD"

7
source4/script/valgrind_run
View File

@ -1,2 +1,7 @@
#!/bin/sh
valgrind -q --db-attach=yes --num-callers=30 $@
ENV="$1"
shift 1
$ENV valgrind -q --db-attach=yes --num-callers=30 $@

12
source4/selftest/config.mk
View File

@ -37,32 +37,32 @@ testenv: everything
valgrindtest: valgrindtest-all
valgrindtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run" \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
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 $(srcdir)/script/valgrind_run" \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
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 $(srcdir)/script/valgrind_run" \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
$(SELFTEST) --socket-wrapper --testenv
gdbtest: gdbtest-all
gdbtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
gdbtest-all: everything
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) --immediate --socket-wrapper $(TESTS)
gdbtest-env: everything
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) --socket-wrapper --testenv
wintest: all

3
source4/selftest/selftest.pl
View File

@ -539,7 +539,6 @@ sub write_clientconf($$)
close(CF);
}
my @torture_options = ();
push (@torture_options, "--configfile=$conffile");
# ensure any one smbtorture call doesn't run too long
@ -769,7 +768,7 @@ TORTURE_OPTIONS=\$TORTURE_OPTIONS
CONFIGURATION=\$CONFIGURATION
$envvarstr
\" && bash'");
\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
teardown_env($testenv_name);
} else {
foreach (@todo) {

7
source4/selftest/test_subunit.pl Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/perl
use Test::More tests => 0;
use FindBin qw($RealBin);
use lib $RealBin;
use Subunit qw(parse_results);