summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-10 11:33:03 +0200
committerGünther Deschner <gd@samba.org>2010-08-13 18:30:50 +0200
commitf00b61c7d4611802c66495824c97af6cad69704e (patch)
tree99cad3711bb0d0231a8e8bef3baea8aab78e3e81 /source3
parent472d2a356fe2fad8b54920d99e2829344fd646cd (diff)
downloadsamba-f00b61c7d4611802c66495824c97af6cad69704e.tar.gz
samba-f00b61c7d4611802c66495824c97af6cad69704e.tar.bz2
samba-f00b61c7d4611802c66495824c97af6cad69704e.zip
s3-selftest: move make test to selftest.
The old "make test" can be still called as "make oldtest". Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ea00b75a58..4ac425d8e7 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"