The branch, master has been updated via df4e38fcc3232da3ed63ebca6f7b9ff7665b1e40 (commit) via 7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea (commit) from 6ed02233c3d873d4aa6ee4306d61cc2aad465a5d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit df4e38fcc3232da3ed63ebca6f7b9ff7665b1e40 Author: Stefan Metzmacher <me...@samba.org> Date: Fri Jan 30 14:00:54 2009 +0100 s3:selftest: run test_posix_s3.sh tests metze commit 7f283b29f14fc3c39fdb164f2c8e9ca18b4442ea Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 3 00:08:24 2009 +0100 s3:build: pass the path to smbtorture4 down to make with and without '-t' prefix metze ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 7 +++++-- source3/m4/check_path.m4 | 4 +++- source3/samba4.m4 | 3 ++- source3/selftest/tests.sh | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 5d15e0f..531f64f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -19,6 +19,7 @@ datarootd...@datarootdir@ selftest_pref...@selftest_prefix@ selftest_shrd...@selftest_shrdir@ smbtorture4_pa...@smbtorture4_path@ +smbtorture4_opti...@smbtorture4_option@ selftest_custom_co...@selftest_custom_conf@ li...@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 @@ -2953,7 +2954,9 @@ selftestdir = ../selftest S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin" selftest:: all torture timelimit - @$(S3_LD_LIBPATH_OVERRIDE) PERL="$(PERL)" \ + @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \ + SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \ + PERL="$(PERL)" PYTHON="$(PYTHON)" \ $(PERL) $(selftestdir)/selftest.pl \ --prefix=${selftest_prefix} --target=samba3 \ --testlist="$(srcdir)/selftest/tests.sh|" \ diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index 12b9987..0a61733 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 ee47fcc..e2c754b 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) diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh index 0ac194e..812a3a7 100755 --- a/source3/selftest/tests.sh +++ b/source3/selftest/tests.sh @@ -129,3 +129,42 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb plantest "blackbox.net_s3" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh +( + shift $# + testitprefix="posix_s3." + testitenv="dc:local" + + SMBTORTURE4BINARY=$SMBTORTURE4 + TORTURE4_OPTIONS="" + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --configfile=\$SMB_CONF_PATH" + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME" + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=$SELFTEST_TARGET" + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --basedir=$SELFTEST_PREFIX" + if [ -n "$SELFTEST_VERBOSE" ]; then + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:progress=no" + fi + TORTURE_OPTIONS="$TORTURE4_OPTIONS --format=subunit" + if [ -n "$SELFTEST_QUICK" ]; then + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:quick=yes" + fi + + # This is an ugly hack... + TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:localdir=$SELFTEST_PREFIX/dc/share" + + if [ -x "$SMBTORTURE4" ]; then + LIB_PATH_VAR_VAR="\$`echo $LIB_PATH_VAR`" + S4_LIB_PREFIX=`eval echo "$LIB_PATH_VAR=\"$SAMBA4SHAREDDIR:$LIB_PATH_VAR_VAR\""` + SMBTORTURE4="$S4_LIB_PREFIX $SMBTORTURE4" + SMBTORTURE4VERSION=`eval $SMBTORTURE4 --version` + fi + if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then + echo "Using SMBTORTURE4: $SMBTORTURE4BINARY" + echo "Version: $SMBTORTURE4VERSION" + . $SCRIPTDIR/test_posix_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "" + else + echo "Skip Tests with Samba4's smbtorture" + echo "Try to compile with --with-smbtorture4-path=PATH to enable" + fi + +) + -- Samba Shared Repository