[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Fri Aug 13 10:41:01 MDT 2010


The branch, master has been updated
       via  f00b61c... s3-selftest: move make test to selftest.
      from  472d2a3... s3-selftest: fix testparm tests as non-root.

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


- Log -----------------------------------------------------------------
commit f00b61c7d4611802c66495824c97af6cad69704e
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

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

Summary of changes:
 source3/Makefile.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ea00b75..4ac425d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3281,7 +3281,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}
 
@@ -3300,7 +3300,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)" \
@@ -3314,16 +3314,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"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list