From: Thomas Wood <thomas.wood@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch
Subject: [PATCH i-g-t 4/8] lib: add igt_simple_init_parse_opts
Date: Wed, 23 Jul 2014 11:57:51 +0100 [thread overview]
Message-ID: <1406113075-30860-5-git-send-email-thomas.wood@intel.com> (raw)
In-Reply-To: <1406113075-30860-1-git-send-email-thomas.wood@intel.com>
This function allows simple tests to register additional command line
options.
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
lib/igt_core.c | 22 ++++++++++++++++++++++
lib/igt_core.h | 5 +++++
2 files changed, 27 insertions(+)
diff --git a/lib/igt_core.c b/lib/igt_core.c
index ee6f90c..72c77e6 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -500,6 +500,28 @@ void igt_simple_init(int argc, char **argv)
optind = 1;
}
+/**
+ * igt_simple_init_parse_opts:
+ * @argc: argc from the test's main()
+ * @argv: argv from the test's main()
+ * @extra_short_opts: getopt_long() compliant list with additional short options
+ * @extra_long_opts: getopt_long() compliant list with additional long options
+ * @help_str: help string for the additional options
+ * @extra_opt_handler: handler for the additional options
+ *
+ * This initializes a simple test without any support for subtests and allows
+ * an arbitrary set of additional options.
+ */
+void igt_simple_init_parse_opts(int argc, char **argv,
+ const char *extra_short_opts,
+ struct option *extra_long_opts,
+ const char *help_str,
+ igt_opt_handler_t extra_opt_handler)
+{
+ common_init(argc, argv, extra_short_opts, extra_long_opts, help_str,
+ extra_opt_handler);
+}
+
/*
* Note: Testcases which use these helpers MUST NOT output anything to stdout
* outside of places protected by igt_run_subtest checks - the piglit
diff --git a/lib/igt_core.h b/lib/igt_core.h
index 6138487..408cf3a 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -162,6 +162,11 @@ bool igt_only_list_subtests(void);
static void igt_tokencat(__real_main, __LINE__)(void) \
void igt_simple_init(int argc, char **argv);
+void igt_simple_init_parse_opts(int argc, char **argv,
+ const char *extra_short_opts,
+ struct option *extra_long_opts,
+ const char *help_str,
+ igt_opt_handler_t extra_opt_handler);
/**
* igt_simple_main:
--
1.9.3
next prev parent reply other threads:[~2014-07-23 10:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 10:57 [PATCH i-g-t 0/8] command line parsing Thomas Wood
2014-07-23 10:57 ` [PATCH i-g-t 1/8] lib: warn when attempting to run an unknown subtest Thomas Wood
2014-07-24 9:49 ` Gore, Tim
2014-07-23 10:57 ` [PATCH i-g-t 2/8] tests: remove unused getopt header includes Thomas Wood
2014-07-24 9:50 ` Gore, Tim
2014-07-23 10:57 ` [PATCH i-g-t 3/8] lib: move option parsing into common_init Thomas Wood
2014-07-23 12:13 ` Daniel Vetter
2014-07-23 12:15 ` Daniel Vetter
2014-07-24 9:52 ` Gore, Tim
2014-07-23 10:57 ` Thomas Wood [this message]
2014-07-24 9:54 ` [PATCH i-g-t 4/8] lib: add igt_simple_init_parse_opts Gore, Tim
2014-07-23 10:57 ` [PATCH i-g-t 5/8] lib: don't ignore unknown options in multi-tests Thomas Wood
2014-07-24 9:55 ` Gore, Tim
2014-07-23 10:57 ` [PATCH i-g-t 6/8] tests: convert simple tests to use igt_simple_init_parse_opts Thomas Wood
2014-07-24 10:17 ` Gore, Tim
2014-07-25 16:08 ` [PATCH i-g-t] lib: avoid getopt value conflicts with tests Thomas Wood
2014-07-25 16:57 ` Paulo Zanoni
2014-07-28 9:38 ` Thomas Wood
2014-07-28 15:18 ` [PATCH i-g-t] lib: check test options for conflicts Thomas Wood
2014-07-23 10:57 ` [PATCH i-g-t 7/8] lib: always warn about unknown options Thomas Wood
2014-07-24 10:33 ` Gore, Tim
2014-07-23 10:57 ` [PATCH i-g-t 8/8] lib: add a command line option to enable debug output in tests Thomas Wood
2014-07-24 10:37 ` Gore, Tim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406113075-30860-5-git-send-email-thomas.wood@intel.com \
--to=thomas.wood@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox