diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-22 00:47:48 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-24 01:51:00 -0600 |
| commit | af7e3dadf9b26cbd817ae5638d37796482694282 (patch) | |
| tree | 53e6fbdff7f495c4ab3235c0c34bf21870e46ba7 /source4/selftest | |
| parent | 6915cad1274a8495439b41d5046daeef24d2c36b (diff) | |
| download | samba-af7e3dadf9b26cbd817ae5638d37796482694282.tar.gz samba-af7e3dadf9b26cbd817ae5638d37796482694282.tar.bz2 samba-af7e3dadf9b26cbd817ae5638d37796482694282.zip | |
r26561: Fix make gdbtest, valgrindtest and testenv for shared libs.
(This used to be commit d2b9055bc032506849827d6fab2d2b9d35d132e2)
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/config.mk | 12 | ||||
| -rwxr-xr-x | source4/selftest/selftest.pl | 3 | ||||
| -rwxr-xr-x | source4/selftest/test_subunit.pl | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index d8b886a6dc..0d5f4d6ab4 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -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 diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 7401205041..96409558b1 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -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) { diff --git a/source4/selftest/test_subunit.pl b/source4/selftest/test_subunit.pl new file mode 100755 index 0000000000..28522ed49f --- /dev/null +++ b/source4/selftest/test_subunit.pl @@ -0,0 +1,7 @@ +#!/usr/bin/perl + +use Test::More tests => 0; +use FindBin qw($RealBin); +use lib $RealBin; +use Subunit qw(parse_results); + |