[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  bf41982 Revert "s4:RPC-SPOOLSS-NOTIFY: skip test_RFFPCNEx() for now, as the test is broken"
       via  2936a21 s3-selftest: move make test to selftest.
      from  7032d7c s3-waf: Fixed the build. (cherry picked from commit f036b449db07c17d04b7f47b1defedef2c2a0970)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit bf41982a429d723b6392a1cf24109ad224ace04b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 16 12:11:19 2010 +0200

    Revert "s4:RPC-SPOOLSS-NOTIFY: skip test_RFFPCNEx() for now, as the test is broken"
    
    This reverts commit 8ca8250443319e0f19f05aab2014118fd03eaa8a.
    (cherry picked from commit dba68d845200bb4416a87c5777de2b554110d20b)

commit 2936a2156026a0c10e9253f0fdeed65a9dd40cf8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 10 11:33:03 2010 +0200

    s3-selftest: move make test to selftest.
    
    The old "make test" can be still called as "make oldtest".
    
    Guenther
    (cherry picked from commit f00b61c7d4611802c66495824c97af6cad69704e)

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

Summary of changes:
 source3/Makefile.in                  |   12 ++++++------
 source4/torture/rpc/spoolss_notify.c |    9 ---------
 2 files changed, 6 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 67540df..c8c73f5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3277,7 +3277,7 @@ test_pam_modules:: pam_modules
 
 TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf}
 
-test:: all torture timelimit
+oldtest:: all torture timelimit
 	@echo Running Test suite
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
@@ -3296,7 +3296,7 @@ S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
 
 SUBUNIT_FORMATTER = $(PYTHON) $(selftestdir)/format-subunit --immediate
 
-selftest:: all torture timelimit
+test:: all torture timelimit
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
 		SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
 		PERL="$(PERL)" PYTHON="$(PYTHON)" \
@@ -3310,16 +3310,16 @@ selftest:: all torture timelimit
 		--expected-failures=$(srcdir)/selftest/knownfail | \
 		$(SUBUNIT_FORMATTER)
 
-selftest-%:
-	$(MAKE) selftest TESTS=$*
+test-%:
+	$(MAKE) test TESTS=$*
 
 SELFTEST_TESTENV = dc
 
 testenv:
-	$(MAKE) selftest SELFTEST_TESTENV=$(SELFTEST_TESTENV) TESTS="--testenv"
+	$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) TESTS="--testenv"
 
 gdbtestenv:
-	$(MAKE) selftest SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
+	$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
 		SMBD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
 		WINBINDD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
 		TESTS="--testenv"
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 7ef054a..8e23637 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -500,15 +500,6 @@ static bool test_RFFPCNEx(struct torture_context *tctx,
 #endif
 	struct dcerpc_binding_handle *b = p->binding_handle;
 
-	/*
-	 * FIXME:
-	 * This test is currently broken, as the started dcerpc server
-	 * does not accept anonyous connection, because it is not provisioned.
-	 *
-	 * See https://bugzilla.samba.org/show_bug.cgi?id=7486.
-	 */
-	torture_skip(tctx, "skipping test_RFFPCNEx tests\n");
-
 	received_packets = NULL;
 
 	/* Start DCE/RPC server */


-- 
Samba Shared Repository