diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 8 | ||||
| -rw-r--r-- | source3/m4/check_path.m4 | 8 | ||||
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 6 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rwxr-xr-x | source3/wscript | 3 |
5 files changed, 16 insertions, 11 deletions
diff --git a/source3/configure.in b/source3/configure.in index f0dde646e3..db7df4d59c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -476,7 +476,7 @@ if test "x$developer" = xyes; then default_shared_modules="$default_shared_modules perfcount_test" fi -if test x"$RUN_FROM_BUILD_FARM" = x"yes" -o "x$developer" = xyes; then +if test x"$selftest" = x"yes" -o "x$developer" = xyes; then default_shared_modules="$default_shared_modules vfs_fake_acls" fi @@ -6602,10 +6602,10 @@ fi ################################################# # If run from the build farm, enable NASTY hacks ################################################# -AC_MSG_CHECKING(whether to enable build farm hacks) -if test x"$RUN_FROM_BUILD_FARM" = x"yes"; then +AC_MSG_CHECKING(whether to enable features for selftest) +if test x"$selftest" = x"yes"; then AC_MSG_RESULT(yes) - AC_DEFINE(ENABLE_BUILD_FARM_HACKS, 1, [Defined if running in the build farm]) + AC_DEFINE(ENABLE_SELFTEST, 1, [Support features needed for selftest]) else AC_MSG_RESULT(no) fi diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4 index f0b98c9d53..1932a33cc8 100644 --- a/source3/m4/check_path.m4 +++ b/source3/m4/check_path.m4 @@ -44,6 +44,14 @@ AC_ARG_ENABLE(developer, [AS_HELP_STRING([--enable-developer], [Turn on develope developer=yes fi]) +AC_SUBST(selftest) +selftest=no +AC_ARG_ENABLE(selftest, [AS_HELP_STRING([--enable-selftest], [Turn on selftest capability (default=no)])], + [if eval "test x$enable_selftest = xyes"; then + debug=yes + selftest=yes + fi]) + krb5developer=no AC_ARG_ENABLE(krb5developer, [AS_HELP_STRING([--enable-krb5developer], [Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)])], [if eval "test x$enable_krb5developer = xyes"; then diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 1bbdae2985..811d44e6bb 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -355,10 +355,10 @@ static void aio_child_loop(int sockfd, struct mmap_area *map) cmd_type_str(cmd_struct.cmd), (int)cmd_struct.n, (int)cmd_struct.offset, fd)); -#ifdef ENABLE_BUILD_FARM_HACKS +#ifdef DEVELOPER { /* - * In the build farm, we want erratic behaviour for + * For developer testing, we want erratic behaviour for * async I/O times */ uint8_t randval; @@ -384,7 +384,7 @@ static void aio_child_loop(int sockfd, struct mmap_area *map) cmd_struct.offset); #if 0 /* This breaks "make test" when run with aio_fork module. */ -#ifdef ENABLE_BUILD_FARM_HACKS +#ifdef DEVELOPER ret_struct.size = MAX(1, ret_struct.size * 0.9); #endif #endif diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index bce1c5b610..0b5a0e87f0 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -448,7 +448,7 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->szPrintcommand, "lp -r -P%p %s"); break; -#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) case PRINT_TEST: case PRINT_VLP: { diff --git a/source3/wscript b/source3/wscript index c807ddcfc9..d05b21d57d 100755 --- a/source3/wscript +++ b/source3/wscript @@ -1014,9 +1014,6 @@ main() { msg='Checking for ftruncate extend', addmain=False, execute=True) - if os.getenv('RUN_FROM_BUILD_FARM'): - Logs.info("enabling buildfarm hacks") - conf.DEFINE('ENABLE_BUILD_FARM_HACKS', '1') if Options.options.with_sendfile_support: if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1): |