Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest

[ab/samba.git/.git] / source4 / selftest / config.mk

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 0d5f4d6ab47c4de2e06889418512b58800ac7c6c..dd440edb533625b4b0818f468162a00a93a427cc 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -1,71 +1,84 @@
 TEST_FORMAT = plain
 
-SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
-    --expected-failures=$(srcdir)/samba4-knownfail \
+    --expected-failures=$(srcdir)/selftest/knownfail \
        --format=$(TEST_FORMAT) \
-    --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \
+    --exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \
     $(TEST_OPTIONS) 
 
-test: everything
+SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow
+SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick 
+
+slowtest:: everything
        $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)
 
-testone: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)
+test:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --immediate \
+               $(TESTS)
 
-test-swrap: everything
-       $(SELFTEST) --socket-wrapper --immediate $(TESTS)
+kvmtest:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --immediate \
+               --target=kvm --image=$(KVM_IMAGE)
 
-test-swrap-pcap: everything
-       $(SELFTEST) --socket-wrapper-pcap --immediate $(TESTS)
+kvmquicktest:: everything
+       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate \
+               $(SELFTEST_QUICK_OPTS) --target=kvm --image=$(KVM_IMAGE)
 
-test-swrap-keep-pcap: everything
-       $(SELFTEST) --socket-wrapper-keep-pcap --immediate $(TESTS)
+testone:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)
 
-test-noswrap: everything
-       $(SELFTEST) --immediate $(TESTS)
+test-swrap:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --immediate $(TESTS)
 
-quicktest: all
-       $(SELFTEST) --quick --socket-wrapper --immediate $(TESTS)
+test-swrap-pcap:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-pcap --immediate $(TESTS)
 
-quicktestone: all
-       $(SELFTEST) --quick --socket-wrapper --one $(TESTS)
+test-swrap-keep-pcap:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-keep-pcap --immediate $(TESTS)
 
-testenv: everything
-       $(SELFTEST) --socket-wrapper --testenv
+test-noswrap:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate $(TESTS)
 
-valgrindtest: valgrindtest-all
+quicktest:: all
+       $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --immediate $(TESTS)
 
-valgrindtest-quick: all
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-       $(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
+quicktestone:: all
+       $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --one $(TESTS)
 
-valgrindtest-all: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-       $(SELFTEST) --immediate --socket-wrapper $(TESTS)
+testenv:: everything
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
-valgrindtest-env: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
-       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-       $(SELFTEST) --socket-wrapper --testenv
+testenv-%:: everything
+       SELFTEST_TESTENV=$* $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
-gdbtest: gdbtest-all
+valgrindtest:: valgrindtest-all
 
-gdbtest-quick: all
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-       $(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
+valgrindtest-quick:: all
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+       $(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
+
+valgrindtest-all:: everything
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
-gdbtest-all: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-       $(SELFTEST) --immediate --socket-wrapper $(TESTS)
+valgrindtest-env:: everything
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+       VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
-gdbtest-env: everything
-       SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-       $(SELFTEST) --socket-wrapper --testenv
+gdbtest:: gdbtest-all
 
-wintest: all
-       $(SELFTEST) win
+gdbtest-quick:: all
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+       $(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
 
+gdbtest-all:: everything
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
+gdbtest-env:: everything
+       SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv