From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:17:29 +0100 Subject: s4: Remove the old perl/m4/make/mk-based build system. The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104 --- source4/selftest/config.mk | 124 --------------------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 source4/selftest/config.mk (limited to 'source4/selftest') diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk deleted file mode 100644 index e8035e607c..0000000000 --- a/source4/selftest/config.mk +++ /dev/null @@ -1,124 +0,0 @@ -SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \ - $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \ - --builddir=$(builddir) --srcdir=$(srcdir) \ - --exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \ - $(TEST_OPTIONS) -# this strange code is to handle the fact that the bash pipefail option is -# not portable. When we run selftest we use a pipeline, and the first element -# of that pipeline might abort. We need to catch this and mark the test -# as having failed -ST_RM = ( rm -f $(selftest_prefix)/st_done && -ST_TOUCH = && touch $(selftest_prefix)/st_done ) -ST_DONE_TEST = @test -f $(selftest_prefix)/st_done || { echo "SELFTEST FAILED"; exit 1; } - -SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow -SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick -FILTER_XFAIL = $(PYTHON) -u $(selftestdir)/filter-subunit --expected-failures=$(srcdir)/selftest/knownfail -SUBUNIT_FORMATTER ?= $(PYTHON) -u $(selftestdir)/format-subunit --prefix=${selftest_prefix} --immediate -FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER) - -test-subunit:: everything - $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) - $(ST_DONE_TEST) - -test-subunit-filtered:: everything - $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL) - $(ST_DONE_TEST) - -slowtest:: everything - $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -ifeq ($(RUN_FROM_BUILD_FARM),yes) -test:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL) --strip-passed-output - $(ST_DONE_TEST) - test -f ${selftest_prefix}/summary && cat ${selftest_prefix}/summary -else -test:: - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) -endif - -kvmtest:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) \ - --target=kvm --image=$(KVM_IMAGE) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -kvmquicktest:: everything - $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) \ - $(SELFTEST_QUICK_OPTS) --target=kvm --image=$(KVM_IMAGE) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -testone:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --one $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -test-swrap:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -test-swrap-pcap:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-pcap $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -test-swrap-keep-pcap:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-keep-pcap $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -test-noswrap:: everything - $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -quicktest:: all - $(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -quicktest-subunit:: all - $(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) $(ST_TOUCH) - $(ST_DONE_TEST) - -quicktestone:: all - $(ST_RM) $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --one $(TESTS) | $(FORMAT_TEST_OUTPUT) - $(ST_DONE_TEST) - -testenv:: everything - $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv - -testenv-%:: everything - SELFTEST_TESTENV=$* $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv - -test-%:: - $(MAKE) test TESTS=$* - -valgrindtest:: valgrindtest-all - -valgrindtest-quick:: all - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ - VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT) - -valgrindtest-all:: everything - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/valgrind_run $(LD_LIBPATH_OVERRIDE)" \ - VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT) - -valgrindtest-env:: everything - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/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:: gdbtest-all - -gdbtest-quick:: all - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ - $(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT) - -gdbtest-all:: everything - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ - $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper $(TESTS) | $(FORMAT_TEST_OUTPUT) - -gdbtest-env:: everything - SAMBA_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ - $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv - -- cgit