libsmbconf: testsuite: add support for "--configfile" option.

Michael

diff --git a/source/Makefile.in b/source/Makefile.in
index 96131ef61c58774f7bdb2332f09e296e8a021b0b..0fe0b5db7d4a6bbb7be095a494acb123d2e9f0e0 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -208,7 +208,8 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
        bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
        bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
        bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
-       bin/tdbtorture@EXEEXT@
+       bin/tdbtorture@EXEEXT@ \
+       bin/smbconftort@EXEEXT@
 
 BIN_PROGS = @EXTRA_BIN_PROGS@ \
        $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
@@ -843,7 +844,8 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
                  $(RPC_PARSE_OBJ1) \
                  $(LIBSAMBA_OBJ) \
                  $(DOSERR_OBJ) \
-                 $(SECRETS_OBJ)
+                 $(SECRETS_OBJ) \
+                 $(POPT_LIB_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
             librpc/gen_ndr/ndr_libnet_join.o

diff --git a/source/lib/smbconf/testsuite.c b/source/lib/smbconf/testsuite.c
index 16f3532cec270fdacab1f0d7a07b2188b68bc4c8..faf4cb9e1576d7f3c4ba5e4c9b2001ed76c3ad98 100644 (file)
--- a/source/lib/smbconf/testsuite.c
+++ b/source/lib/smbconf/testsuite.c
@@ -89,6 +89,37 @@ static bool torture_smbconf(void)
 
 int main(int argc, const char **argv)
 {
-       bool ret = torture_smbconf();
+       bool ret;
+       poptContext pc;
+
+       struct poptOption long_options[] = {
+               POPT_COMMON_CONFIGFILE
+               {0, 0, 0, 0}
+       };
+
+       load_case_tables();
+
+       /* parse options */
+       pc = poptGetContext("smbconftort", argc, (const char **)argv,
+                           long_options, 0);
+
+       while(poptGetNextOpt(pc) != -1) { }
+
+       poptFreeContext(pc);
+
+       ret = lp_load(get_dyn_CONFIGFILE(),
+                     true,  /* globals_only */
+                     false, /* save_defaults */
+                     false, /* add_ipc */
+                     true   /* initialize globals */);
+
+       if (!ret) {
+               printf("failure: error loading the configuration\n");
+               goto done;
+       }
+
+       ret = torture_smbconf();
+
+done:
        return ret ? 0 : -1;
 }