diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-21 08:16:24 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-21 06:39:04 +0200 |
| commit | 4d5471f1c634450020c4530f8d0c8dfcd7252fb3 (patch) | |
| tree | 21dd9b9cf67d96634eabbf62bce641996dfabe7f /lib | |
| parent | 7cd4eb0ca69026031620cbe578cfd7216ea9ac6c (diff) | |
| download | samba-4d5471f1c634450020c4530f8d0c8dfcd7252fb3.tar.gz samba-4d5471f1c634450020c4530f8d0c8dfcd7252fb3.tar.bz2 samba-4d5471f1c634450020c4530f8d0c8dfcd7252fb3.zip | |
build: Remove special case for the build farm
Except in the formatting of the selftest output, this removes the special case
of the build farm, so that an autobuild, a manual make test and the build farm
are more similar.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug 21 06:39:04 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/nss_wrapper/config.m4 | 2 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | lib/socket_wrapper/config.m4 | 2 | ||||
| -rw-r--r-- | lib/uid_wrapper/config.m4 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/nss_wrapper/config.m4 b/lib/nss_wrapper/config.m4 index ad1a168e73..1e864bfc3a 100644 --- a/lib/nss_wrapper/config.m4 +++ b/lib/nss_wrapper/config.m4 @@ -3,7 +3,7 @@ AS_HELP_STRING([--enable-nss-wrapper], [Turn on nss wrapper library (default=no) HAVE_NSS_WRAPPER=no -if eval "test x$developer = xyes"; then +if eval "test x$developer = xyes -o x$selftest = xyes"; then enable_nss_wrapper=yes fi diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 591e6e5dbe..f9624d6ca9 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -157,7 +157,7 @@ enum acl_compatibility {ACL_COMPAT_AUTO, ACL_COMPAT_WINNT, ACL_COMPAT_WIN2K}; enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ, PRINT_CUPS,PRINT_LPRNT,PRINT_LPROS2,PRINT_IPRINT -#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) ,PRINT_TEST,PRINT_VLP #endif /* DEVELOPER */ }; diff --git a/lib/param/param_table.c b/lib/param/param_table.c index ea0fa3de6f..4126d89c65 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -190,7 +190,7 @@ static const struct enum_list enum_printing[] = { {PRINT_IPRINT, "iprint"}, {PRINT_LPRNT, "nt"}, {PRINT_LPROS2, "os2"}, -#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) {PRINT_TEST, "test"}, {PRINT_VLP, "vlp"}, #endif /* DEVELOPER */ diff --git a/lib/socket_wrapper/config.m4 b/lib/socket_wrapper/config.m4 index e20333e3ed..ff6b67b277 100644 --- a/lib/socket_wrapper/config.m4 +++ b/lib/socket_wrapper/config.m4 @@ -4,7 +4,7 @@ AS_HELP_STRING([--enable-socket-wrapper], [Turn on socket wrapper library (defau DEFAULT_TEST_OPTIONS= HAVE_SOCKET_WRAPPER=no -if eval "test x$developer = xyes"; then +if eval "test x$developer = xyes -o x$selftest = xyes"; then enable_socket_wrapper=yes fi diff --git a/lib/uid_wrapper/config.m4 b/lib/uid_wrapper/config.m4 index 2cd573e7f2..a5652336f0 100644 --- a/lib/uid_wrapper/config.m4 +++ b/lib/uid_wrapper/config.m4 @@ -3,7 +3,7 @@ AS_HELP_STRING([--enable-uid-wrapper], [Turn on uid wrapper library (default=no) HAVE_UID_WRAPPER=no -if eval "test x$developer = xyes"; then +if eval "test x$developer = xyes -o x$selftest = xyes"; then enable_uid_wrapper=yes fi |