Rev 11308: Simplify socket wrapper detection code, add testone and quicktestone targets. in file:///home/jelmer/bzr.samba/4.0-perlselftest/

Jelmer Vernooij jelmer at samba.org
Thu Feb 1 13:16:55 GMT 2007


At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11308
revision-id: jelmer at samba.org-20070201131646-x23y1edlqu155prz
parent: jelmer at samba.org-20070201123242-dwdz7ryz7rmv15xz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Thu 2007-02-01 14:16:46 +0100
message:
  Simplify socket wrapper detection code, add testone and quicktestone targets.
modified:
  source/build/smb_build/makefile.pm svn-v2:3690 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fbuild%2fsmb_build%2fmakefile.pm
  source/lib/socket_wrapper/config.m4 svn-v2:6140 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fsocket_wrapper%2fconfig.m4
  source/main.mk                 svn-v2:8991 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fmain.mk
=== modified file 'source/build/smb_build/makefile.pm'
--- a/source/build/smb_build/makefile.pm	2007-01-22 00:04:59 +0000
+++ b/source/build/smb_build/makefile.pm	2007-02-01 13:16:46 +0000
@@ -157,7 +157,7 @@
 
 GCOV=$self->{config}->{GCOV}
 
-DEFAULT_TEST_TARGET=$self->{config}->{DEFAULT_TEST_TARGET}
+DEFAULT_TEST_OPTIONS=$self->{config}->{DEFAULT_TEST_OPTIONS}
 
 __EOD__
 );

=== modified file 'source/lib/socket_wrapper/config.m4'
--- a/source/lib/socket_wrapper/config.m4	2005-05-05 11:33:10 +0000
+++ b/source/lib/socket_wrapper/config.m4	2007-02-01 13:16:46 +0000
@@ -1,7 +1,7 @@
 AC_ARG_ENABLE(socket-wrapper, 
 [  --enable-socket-wrapper         Turn on socket wrapper library (default=no)])
 
-DEFAULT_TEST_TARGET=test-noswrap
+DEFAULT_TEST_OPTIONS=
 HAVE_SOCKET_WRAPPER=no
 
 if eval "test x$developer = xyes"; then
@@ -10,9 +10,9 @@
     
 if eval "test x$enable_socket_wrapper = xyes"; then
         AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library])
-	DEFAULT_TEST_TARGET=test-swrap
+	DEFAULT_TEST_OPTIONS=--socket-wrapper
 	HAVE_SOCKET_WRAPPER=yes
 fi
 
-AC_SUBST(DEFAULT_TEST_TARGET)
+AC_SUBST(DEFAULT_TEST_OPTIONS)
 AC_SUBST(HAVE_SOCKET_WRAPPER)

=== modified file 'source/main.mk'
--- a/source/main.mk	2007-02-01 12:24:26 +0000
+++ b/source/main.mk	2007-02-01 13:16:46 +0000
@@ -286,9 +286,14 @@
 	-rm -f $(MANPAGES)
 
 check:: test
-test: $(DEFAULT_TEST_TARGET)
-
-SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} --builddir=$(builddir) --srcdir=$(srcdir) --expected-failures=samba4-knownfail
+
+SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} --builddir=$(builddir) --srcdir=$(srcdir) --expected-failures=samba4-knownfail 
+
+test:
+	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS)
+
+testone:
+	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) --one
 
 test-swrap: all libraries
 	$(SELFTEST) --socket-wrapper $(TESTS)
@@ -296,6 +301,9 @@
 test-noswrap: all libraries
 	$(SELFTEST) $(TESTS)
 
+quicktestone:
+	$(SELFTEST) --quick --socket-wrapper --one $(TESTS)
+
 quicktest: all
 	$(SELFTEST) --quick --socket-wrapper $(TESTS)
 



More information about the samba-cvs mailing list