summaryrefslogtreecommitdiff
path: root/source3/m4
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-01-25 14:38:44 -0800
committerTim Prouty <tprouty@samba.org>2009-01-26 12:07:27 -0800
commit3aeee79096e7a3c4f1467228d5cbee6986866400 (patch)
treebf9ba96f83526504565de1470d7f1834bbd3e8b5 /source3/m4
parentcce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9 (diff)
downloadsamba-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/m4')
-rw-r--r--source3/m4/check_path.m419
1 files changed, 19 insertions, 0 deletions
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