diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-06 18:32:21 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-06 20:51:55 +1000 |
| commit | 49b27203174647d66fbf6a35266d587cc9e2e5cc (patch) | |
| tree | 71a9c3d53df51f4574cb91aa5006b00edd01dd10 | |
| parent | 1c7bd2b71c3cd54f3f72c34b9bbad1db2ef40722 (diff) | |
| download | samba-49b27203174647d66fbf6a35266d587cc9e2e5cc.tar.gz samba-49b27203174647d66fbf6a35266d587cc9e2e5cc.tar.bz2 samba-49b27203174647d66fbf6a35266d587cc9e2e5cc.zip | |
lib/param: Also enable vlp when --enable-selftest is specified
| -rw-r--r-- | lib/param/loadparm.h | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | selftest/wscript | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index eb9c76817f..8c4a7b172f 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_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) ,PRINT_TEST,PRINT_VLP #endif /* DEVELOPER */ }; diff --git a/lib/param/param_table.c b/lib/param/param_table.c index a793695083..ea0fa3de6f 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_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) {PRINT_TEST, "test"}, {PRINT_VLP, "vlp"}, #endif /* DEVELOPER */ diff --git a/selftest/wscript b/selftest/wscript index 6359e1aafc..0277eb5083 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -77,6 +77,10 @@ def configure(conf): conf.ADD_LDFLAGS('-lgcov', testflags=True) conf.ADD_CFLAGS('--coverage') + if Options.options.enable_selftest or Options.options.developer: + conf.DEFINE('ENABLE_SELFTEST', 1) + + def cmd_testonly(opt): '''run tests without doing a build first''' env = LOAD_ENVIRONMENT() diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 59f74d7c8e..dc23868a99 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -397,7 +397,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_BUILD_FARM_HACKS) +#if defined(DEVELOPER) || defined(ENABLE_SELFTEST) || defined(ENABLE_BUILD_FARM_HACKS) case PRINT_TEST: case PRINT_VLP: { |