[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  1c5cc4a s4-selftest: Don't use a hardcoded target DC name
       via  f5487b3 selftest: Make combined test the default when s3build is enabled
       via  34e3501 selftest: Fix combination of Samba3 and Samba4 test lists
      from  123097e selftest: Print a better warning warning message when smbcacls fails.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1c5cc4a2d1449296a96e8a137dc177191df00c8d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 28 13:31:33 2011 +1000

    s4-selftest: Don't use a hardcoded target DC name
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Apr 28 07:34:31 CEST 2011 on sn-devel-104

commit f5487b3b47c1e905c21fc2af0acec4426dcb0513
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 19 16:12:19 2011 +1000

    selftest: Make combined test the default when s3build is enabled

commit 34e3501a32f731b527bbba88eb44d6433b826aa2
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 28 13:58:07 2011 +1000

    selftest: Fix combination of Samba3 and Samba4 test lists
    
    The previous code was too subtle, and tried to filter via two xfail
    scripts.  The --fail-immediately for the source3 knownfail would then
    fail samba4 know failures.
    
    Andrew Bartlett
    
    Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba4.pm        |    2 +-
 selftest/wscript                 |   37 +++++++++++++++++++++++++++----------
 source3/selftest/{slow => quick} |    0
 3 files changed, 28 insertions(+), 11 deletions(-)
 copy source3/selftest/{slow => quick} (100%)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 959c161..84ef576 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -873,7 +873,7 @@ sub provision_rpc_proxy($$$)
 	my ($self, $prefix, $dcvars) = @_;
 	print "PROVISIONING RPC PROXY...";
 
-	my $extra_smbconf_options = "dcerpc_remote:binding = ncacn_ip_tcp:localdc
+	my $extra_smbconf_options = "dcerpc_remote:binding = ncacn_ip_tcp:$dcvars->{SERVER}
        dcerpc endpoint servers = epmapper, remote
        dcerpc_remote:interfaces = rpcecho
 ";
diff --git a/selftest/wscript b/selftest/wscript
index 25ea823..5ba1c53 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -73,6 +73,19 @@ def set_options(opt):
 def configure(conf):
     conf.env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
 
+def combine_files(file1, file2, outfile):
+
+    f1 = open(file1)
+    f2 = open(file2)
+    of = open(outfile, mode='w')
+    for line in f1:
+        of.write(line)
+    for line in f2:
+        of.write(line)
+    f1.close()
+    f2.close()
+    of.close()
+
 def cmd_testonly(opt):
     '''run tests without doing a build first'''
     env = LOAD_ENVIRONMENT()
@@ -174,6 +187,8 @@ def cmd_testonly(opt):
 
     if Options.options.TARGET:
         env.SELFTEST_TARGET = Options.options.TARGET
+    elif env.enable_s3build:
+        env.SELFTEST_TARGET = "samba"
     else:
         env.SELFTEST_TARGET = "samba4"
 
@@ -183,17 +198,19 @@ def cmd_testonly(opt):
         env.SELFTEST_DIR = "${srcdir}/source3/selftest"
 
     if env.SELFTEST_TARGET == "samba":
-        env.SELFTEST_DIR = "${srcdir}/source3/selftest"
-        xfail = ""
-        xfail += EXPAND_VARIABLES(opt, env.FILTER_XFAIL)
-        xfail += " | "
-        env.SELFTEST_DIR = "${srcdir}/source4/selftest"
-        xfail += EXPAND_VARIABLES(opt, env.FILTER_XFAIL)
-        env.FILTER_XFAIL = xfail;
-        cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude="${srcdir}/source4/selftest/skip" --exclude="${srcdir}/source3/selftest/skip" --testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+        for f in ["knownfail", "slow", "quick", "skip" ]:
+            combine_files(env.srcdir + "/source4/selftest/" + f,
+                          env.srcdir + "/source3/selftest/" + f,
+                          env.SELFTEST_PREFIX + "/" + f)
+
+        env.SELFTEST_DIR = "${srcdir}/st"
+        env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' +
+                         '--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
     else:
-        # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
-        cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${SELFTEST_DIR}/skip --testlist="${PYTHON} ${SELFTEST_DIR}/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+        env.TESTLISTS = '--testlist="${SELFTEST_DIR}/tests.py|"'
+
+    # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
+    cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${SELFTEST_DIR}/skip ${TESTLISTS} ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
 
     if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
         cmd += ' | ${FORMAT_TEST_OUTPUT}'
diff --git a/source3/selftest/slow b/source3/selftest/quick
similarity index 100%
copy from source3/selftest/slow
copy to source3/selftest/quick


-- 
Samba Shared Repository