From: Andreas Schneider <asn@samba.org>
Date: Wed, 13 Jan 2021 12:53:55 +0000 (+0100)
Subject: s3:rpc_server: Migrate test_mdsparser_es to new cmdline option parser
X-Git-Tag: tevent-0.11.0~783
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=f81fe73f531798a2530efe6b01700135585510d6;p=vlendec%2Fsamba-autobuild%2F.git

s3:rpc_server: Migrate test_mdsparser_es to new cmdline option parser

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/rpc_server/mdssvc/test_mdsparser_es.c b/source3/rpc_server/mdssvc/test_mdsparser_es.c
index 23b93dfa660..b5cb86db9a7 100644
--- a/source3/rpc_server/mdssvc/test_mdsparser_es.c
+++ b/source3/rpc_server/mdssvc/test_mdsparser_es.c
@@ -21,8 +21,7 @@
 #include <cmocka.h>
 #include <jansson.h>
 #include <talloc.h>
-#include "popt.h"
-#include "popt_common_cmdline.h"
+#include "lib/cmdline/cmdline.h"
 #include "libcli/util/ntstatus.h"
 #include "lib/util/samba_util.h"
 #include "lib/torture/torture.h"
@@ -199,7 +198,6 @@ static void test_mdsparser_es(void **state)
 
 int main(int argc, const char *argv[])
 {
-	const char **argv_const = discard_const_p(const char *, argv);
 	const struct CMUnitTest tests[] = {
 		cmocka_unit_test(test_mdsparser_es),
 	};
@@ -210,12 +208,31 @@ int main(int argc, const char *argv[])
 	};
 	poptContext pc;
 	int opt;
+	bool ok;
+	TALLOC_CTX *frame = talloc_stackframe();
 
 	smb_init_locale();
-	setup_logging(argv[0], DEBUG_STDERR);
+
+	ok = samba_cmdline_init(frame,
+				SAMBA_CMDLINE_CONFIG_CLIENT,
+				false /* require_smbconf */);
+	if (!ok) {
+		DBG_ERR("Failed to init cmdline parser!\n");
+		TALLOC_FREE(frame);
+		exit(1);
+	}
 	lp_set_cmdline("log level", "1");
 
-	pc = poptGetContext(argv[0], argc, argv_const, long_options, 0);
+	pc = samba_popt_get_context(getprogname(),
+				    argc,
+				    argv,
+				    long_options,
+				    0);
+	if (pc == NULL) {
+		DBG_ERR("Failed to setup popt context!\n");
+		TALLOC_FREE(frame);
+		exit(1);
+	}
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch(opt) {
@@ -225,8 +242,6 @@ int main(int argc, const char *argv[])
 		}
 	}
 
-	lp_load_global(get_dyn_CONFIGFILE());
-
 	cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
 
 	return cmocka_run_group_tests(tests, NULL, NULL);
diff --git a/source3/wscript_build b/source3/wscript_build
index 8ef11910049..f5deff37c4b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1291,7 +1291,7 @@ bld.SAMBA3_BINARY('test_mdsparser_es',
                  smbconf
                  jansson
                  cmocka
-                 popt_samba3_cmdline
+                 CMDLINE_S3
                  ''',
                  enabled=bld.env.spotlight_backend_es,
                  for_selftest=True)