diff options
| -rw-r--r-- | source4/main.mk | 73 | ||||
| -rw-r--r-- | source4/selftest/config.mk | 74 |
2 files changed, 75 insertions, 72 deletions
diff --git a/source4/main.mk b/source4/main.mk index ec4d40548d..c859423f1e 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -285,78 +285,7 @@ realdistclean: distclean removebackup check:: test -SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ - --builddir=$(builddir) --srcdir=$(srcdir) \ - --expected-failures=$(srcdir)/samba4-knownfail \ - --skip=$(srcdir)/samba4-skip \ - $(TEST_OPTIONS) - -htmltest: everything - $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --format=html $(TESTS) - -test: everything - $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS) - -testone: everything - $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS) - -test-swrap: everything - $(SELFTEST) --socket-wrapper --immediate $(TESTS) - -test-swrap-pcap: everything - $(SELFTEST) --socket-wrapper-pcap --immediate $(TESTS) - -test-swrap-keep-pcap: everything - $(SELFTEST) --socket-wrapper-keep-pcap --immediate $(TESTS) - -test-noswrap: everything - $(SELFTEST) --immediate $(TESTS) - -quicktest: all - $(SELFTEST) --quick --socket-wrapper --immediate $(TESTS) - -htmlquicktest: all - $(SELFTEST) --quick --socket-wrapper --format=html --immediate $(TESTS) - -quicktestone: all - $(SELFTEST) --quick --socket-wrapper --one $(TESTS) - -testenv: everything - $(SELFTEST) --socket-wrapper --testenv - -valgrindtest: valgrindtest-all - -valgrindtest-quick: all - SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ - VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(SELFTEST) --quick --immediate --socket-wrapper $(TESTS) - -valgrindtest-all: everything - SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ - VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(SELFTEST) --immediate --socket-wrapper $(TESTS) - -valgrindtest-env: everything - SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ - VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(SELFTEST) --socket-wrapper --testenv - -gdbtest: gdbtest-all - -gdbtest-quick: all - SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ - $(SELFTEST) --immediate --quick --socket-wrapper $(TESTS) - -gdbtest-all: everything - SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ - $(SELFTEST) --immediate --socket-wrapper $(TESTS) - -gdbtest-env: everything - SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ - $(SELFTEST) --socket-wrapper --testenv - -wintest: all - $(SELFTEST) win +include selftest/config.mk unused_macros: $(srcdir)/script/find_unused_macros.pl `find . -name "*.[ch]"` | sort diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk new file mode 100644 index 0000000000..0f949997df --- /dev/null +++ b/source4/selftest/config.mk @@ -0,0 +1,74 @@ +SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ + --builddir=$(builddir) --srcdir=$(srcdir) \ + --expected-failures=$(srcdir)/samba4-knownfail \ + --skip=$(srcdir)/samba4-skip \ + $(TEST_OPTIONS) + +htmltest: everything + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --format=html $(TESTS) + +test: everything + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS) + +testone: everything + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS) + +test-swrap: everything + $(SELFTEST) --socket-wrapper --immediate $(TESTS) + +test-swrap-pcap: everything + $(SELFTEST) --socket-wrapper-pcap --immediate $(TESTS) + +test-swrap-keep-pcap: everything + $(SELFTEST) --socket-wrapper-keep-pcap --immediate $(TESTS) + +test-noswrap: everything + $(SELFTEST) --immediate $(TESTS) + +quicktest: all + $(SELFTEST) --quick --socket-wrapper --immediate $(TESTS) + +htmlquicktest: all + $(SELFTEST) --quick --socket-wrapper --format=html --immediate $(TESTS) + +quicktestone: all + $(SELFTEST) --quick --socket-wrapper --one $(TESTS) + +testenv: everything + $(SELFTEST) --socket-wrapper --testenv + +valgrindtest: valgrindtest-all + +valgrindtest-quick: all + SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ + VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ + $(SELFTEST) --quick --immediate --socket-wrapper $(TESTS) + +valgrindtest-all: everything + SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ + VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ + $(SELFTEST) --immediate --socket-wrapper $(TESTS) + +valgrindtest-env: everything + SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ + VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ + $(SELFTEST) --socket-wrapper --testenv + +gdbtest: gdbtest-all + +gdbtest-quick: all + SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ + $(SELFTEST) --immediate --quick --socket-wrapper $(TESTS) + +gdbtest-all: everything + SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ + $(SELFTEST) --immediate --socket-wrapper $(TESTS) + +gdbtest-env: everything + SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \ + $(SELFTEST) --socket-wrapper --testenv + +wintest: all + $(SELFTEST) win + + |