diff options
author | Tim Prouty <tprouty@samba.org> | 2009-01-25 14:38:44 -0800 |
---|---|---|
committer | Tim Prouty <tprouty@samba.org> | 2009-01-26 12:07:27 -0800 |
commit | 3aeee79096e7a3c4f1467228d5cbee6986866400 (patch) | |
tree | bf9ba96f83526504565de1470d7f1834bbd3e8b5 /source3/Makefile.in | |
parent | cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9 (diff) | |
download | samba-3aeee79096e7a3c4f1467228d5cbee6986866400.tar.gz samba-3aeee79096e7a3c4f1467228d5cbee6986866400.tar.bz2 samba-3aeee79096e7a3c4f1467228d5cbee6986866400.zip |
s3 make test: Add the ability to specify a custom smb.conf for make test
- Adds new -c <custom conf> option to selftest.sh that when specified
adds a line to make test's server.conf: "include <custom conf>"
- Adds getopts processing to selftest.sh
- Changes selftest.sh shrdir arg to use -s <shrdir>
- Changes selftest.sh smbtorture4_path arg to use -t <smbtortur4 path>
- Adds configure option --with-selftest-custom-conf=<custom conf>
- Updates Makefile.in to take advantage of the new/changed parameters
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cbbf821b22..a1873eb6d5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -19,6 +19,7 @@ datarootdir=@datarootdir@ selftest_prefix=@selftest_prefix@ selftest_shrdir=@selftest_shrdir@ smbtorture4_path=@smbtorture4_path@ +selftest_custom_conf=@selftest_custom_conf@ LIBS=@LIBS@ CC=@CC@ @@ -2928,9 +2929,22 @@ test_pam_modules:: pam_modules ## ## Targets for 'make test' ## + +ifdef smbtorture4_path +smbtorture4_path_arg=-t ${smbtorture4_path} +endif + +ifdef selftest_shrdir +selftest_shrdir_arg=-s ${selftest_shrdir} +endif + +ifdef selftest_custom_conf +selftest_custom_conf_arg=-c ${selftest_custom_conf} +endif + test:: all torture timelimit @echo Running Test suite - @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}" ${selftest_shrdir} + @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg} valgrindtest:: all torture timelimit @echo Running Test suite with valgrind @@ -2939,7 +2953,7 @@ valgrindtest:: all torture timelimit WINBINDD_VALGRIND="xterm -n winbindd -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}/valgrind.log" \ - PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}" + PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg} SELFTEST_FORMAT = plain selftestdir = ../selftest |