svn commit: samba r25707 - in branches/SAMBA_4_0: . source source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-22 01:05:31 +0000 (Mon, 22 Oct 2007)
New Revision: 25707

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25707

Log:
Move selftest makefile code to separate file.
Added:
   branches/SAMBA_4_0/source/selftest/config.mk
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/main.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2007-10-19 14:28:26 UTC (rev 25706)
+++ branches/SAMBA_4_0/source/main.mk	2007-10-22 01:05:31 UTC (rev 25707)
@@ -285,79 +285,8 @@
 
 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) 
+include selftest/config.mk
 
-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
-
 unused_macros:
 	$(srcdir)/script/find_unused_macros.pl `find . -name "*.[ch]"` | sort
 

Added: branches/SAMBA_4_0/source/selftest/config.mk
===================================================================
--- branches/SAMBA_4_0/source/selftest/config.mk	2007-10-19 14:28:26 UTC (rev 25706)
+++ branches/SAMBA_4_0/source/selftest/config.mk	2007-10-22 01:05:31 UTC (rev 25707)
@@ -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
+
+