diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-28 22:16:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:03 -0500 |
| commit | 679ef7b6babef0666749bea1d3b722786ce928d9 (patch) | |
| tree | e042b4b5de1ea41807c7dd6e4b696538c08283de /source3/Makefile.in | |
| parent | 5221ebb299081da6a806362212c6a8ceb9cc70a8 (diff) | |
| download | samba-679ef7b6babef0666749bea1d3b722786ce928d9.tar.gz samba-679ef7b6babef0666749bea1d3b722786ce928d9.tar.bz2 samba-679ef7b6babef0666749bea1d3b722786ce928d9.zip | |
r25415: Merge the 3.2-perltest branch that switches Samba 3.2 to use Samba 4's selftest code. See the mailing list for details.
(This used to be commit bdc831ddb3a860676c36bbd89e6f748946df68a1)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 9de9ea2b78..4ab22abb0c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -15,7 +15,7 @@ localstatedir=@localstatedir@ datarootdir=@datarootdir@ selftest_prefix=@selftest_prefix@ -smbtorture4_path=@smbtorture4_path@ +samba4srcdir=@samba4srcdir@ LIBS=@LIBS@ CC=@CC@ @@ -52,6 +52,8 @@ PERL=@PERL@ PIDL_ARGS=@PIDL_ARGS@ +SELFTEST_ARGS = @SELFTEST_ARGS@ + TERMLDFLAGS=@TERMLDFLAGS@ TERMLIBS=@TERMLIBS@ PRINT_LIBS=@PRINT_LIBS@ @@ -2094,16 +2096,32 @@ test_pam_modules: pam_modules || exit 1; \ done + +SELFTEST = $(PERL) $(samba4srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ + --srcdir="${samba4srcdir}" --bindir=${builddir}/bin --testlist="${srcdir}/script/tests/tests_all.sh|" \ + --expected-failures=samba3-knownfail --target=samba3 --skip=samba3-skip $(SELFTEST_ARGS) ## ## Targets for 'make test' ## test: all torture timelimit @echo Running Test suite - @sh $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}" + @$(SELFTEST) --socket-wrapper $(TESTS) + +htmltest: all torture timelimit + @echo Running Test suite + @$(SELFTEST) --socket-wrapper --format=html $(TESTS) valgrindtest: all torture timelimit @echo Running Test suite with valgrind @NMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \ - $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}" + $(SELFTEST) --socket-wrapper + +gdbtest: all torture timelimit + SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ + $(SELFTEST) --immediate --socket-wrapper $(TESTS) + +testenv: everything + $(SELFTEST) --socket-wrapper --testenv + |