diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-03 00:08:24 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-03 00:10:19 +0100 |
| commit | 7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea (patch) | |
| tree | aba434415cb5105d5ce9fca2c95a31e1774036ad | |
| parent | 6ed02233c3d873d4aa6ee4306d61cc2aad465a5d (diff) | |
| download | samba-7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea.tar.gz samba-7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea.tar.bz2 samba-7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea.zip | |
s3:build: pass the path to smbtorture4 down to make with and without '-t' prefix
metze
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/m4/check_path.m4 | 4 | ||||
| -rw-r--r-- | source3/samba4.m4 | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 5d15e0fcca..9d08f7e9ca 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@ +smbtorture4_option=@smbtorture4_option@ selftest_custom_conf=@selftest_custom_conf@ LIBS=@LIBS@ @@ -2932,7 +2933,7 @@ test_pam_modules:: pam_modules ## Targets for 'make test' ## -TEST_EXTRA_ARGS = ${smbtorture4_path} ${selftest_shrdir} ${selftest_custom_conf} +TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf} test:: all torture timelimit @echo Running Test suite diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index 12b998747a..0a61733870 100644 --- a/source3/m4/check_path.m4 +++ b/source3/m4/check_path.m4 @@ -332,6 +332,8 @@ AC_ARG_WITH(selftest-shrdir, # set path of samba4's smbtorture smbtorture4_path="" AC_SUBST(smbtorture4_path) +smbtorture4_option="" +AC_SUBST(smbtorture4_option) AC_ARG_WITH(smbtorture4_path, [AS_HELP_STRING([--with-smbtorture4-path=PATH], [The path to a samba4 smbtorture for make test (none)])], [ case "$withval" in @@ -343,7 +345,7 @@ AC_ARG_WITH(smbtorture4_path, if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then AC_MSG_ERROR(['$smbtorture_path' does not exist!]) fi - smbtorture4_path="-t $withval" + smbtorture4_option="-t $withval" ;; esac ]) diff --git a/source3/samba4.m4 b/source3/samba4.m4 index ee47fccfb2..e2c754b02b 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -1,5 +1,6 @@ AC_SUBST(BLDSHARED) -smbtorture4_path="-t bin/smbtorture4" +smbtorture4_path="bin/smbtorture4" +smbtorture4_option="-t bin/smbtorture4" m4_include(build/m4/public.m4) m4_include(../m4/check_python.m4) |