summaryrefslogtreecommitdiff
path: root/lib/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-08-21 08:16:24 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-08-21 06:39:04 +0200
commit4d5471f1c634450020c4530f8d0c8dfcd7252fb3 (patch)
tree21dd9b9cf67d96634eabbf62bce641996dfabe7f /lib/param
parent7cd4eb0ca69026031620cbe578cfd7216ea9ac6c (diff)
downloadsamba-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/param')
-rw-r--r--lib/param/loadparm.h2
-rw-r--r--lib/param/param_table.c2
2 files changed, 2 insertions, 2 deletions
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 */