From 3aeee79096e7a3c4f1467228d5cbee6986866400 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Sun, 25 Jan 2009 14:38:44 -0800 Subject: s3 make test: Add the ability to specify a custom smb.conf for make test - Adds new -c option to selftest.sh that when specified adds a line to make test's server.conf: "include " - Adds getopts processing to selftest.sh - Changes selftest.sh shrdir arg to use -s - Changes selftest.sh smbtorture4_path arg to use -t - Adds configure option --with-selftest-custom-conf= - Updates Makefile.in to take advantage of the new/changed parameters --- source3/m4/check_path.m4 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'source3/m4') diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index 444ea1c401..962e2765a0 100644 --- a/source3/m4/check_path.m4 +++ b/source3/m4/check_path.m4 @@ -361,6 +361,25 @@ AC_ARG_WITH(smbtorture4_path, esac ]) +################################################# +# set custom conf for make test +selftest_custom_conf="" +AC_SUBST(selftest_custom_conf) +AC_ARG_WITH(selftest_custom_conf, +[AS_HELP_STRING([--with-selftest-custom-conf=PATH], [An optional custom smb.conf that is included in the server smb.conf during make test(none)])], +[ case "$withval" in + yes|no) + AC_MSG_ERROR([--with-selftest-custom-conf should take a path]) + ;; + * ) + selftest_custom_conf="$withval" + if test -z "$selftest_custom_conf" -a ! -f $selftest_custom_conf; then + AC_MSG_ERROR(['$selftest_custom_conf' does not exist!]) + fi + ;; + esac +]) + ## check for --enable-debug first before checking CFLAGS before ## so that we don't mix -O and -g debug=no -- cgit