jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-20 07:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3c16a2b296
openafs/tests/cmd/command-t.c

392 lines
14 KiB
C
Raw Normal View History

cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
/*
* Copyright (c) 2010 Your File System Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Test the command line parsing library
*/
#include <afsconfig.h>
#include <afs/param.h>
#include <roken.h>
#include <afs/cmd.h>
tests: Start using the upstream C TAP harness Instead of bundling our own copies of Russ's C TAP Harness, start using source pulled from his git repository using the src/external import mechanism. Note that we are not currently building the floating point (is_double) portion of the harness. In the process of doing so, we also upgrade our test harness to the latest upstream version, 1.11. This is somewhat problematic, as there have been some significant code changes since the version bundled with OpenAFS. Work around these by *) Referencing the basic.h header as <tests/tap/basic.h>, rather than just <tap/basic.h>, to match the new upstream layout *) Changing the include path so that the tests/ directory can be found within it. Change-Id: I63efbb30248165e5729005b0a791e7eb7afb051d Reviewed-on: http://gerrit.openafs.org/7374 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Russ Allbery <rra@stanford.edu> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2012-05-07 21:52:16 +01:00
#include <tests/tap/basic.h>
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
enum cmdOptions {
copt_flag = 0,
copt_first,
copt_second,
copt_sugar,
copt_fourth,
copt_fifth,
copt_perhaps,
copt_sanity
};
tests: Use symbolic constants in command-t Change-Id: I1d7e47edc97dcdb855ad5ca732a2f015741c9d18 Reviewed-on: http://gerrit.openafs.org/4709 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-05-23 22:51:59 +01:00
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
static int
testproc(struct cmd_syndesc *as, void *rock)
{
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
is_string("foo", as->parms[copt_first].items->data,
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
"first option matches");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
is_string("bar", as->parms[copt_second].items->data,
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
"second option matches");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
ok(as->parms[copt_flag].items != NULL,
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
"flag is set");
return 0;
}
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
static void
checkList(struct cmd_item *list, ...)
{
va_list ap;
char *el;
va_start(ap, list);
el = va_arg(ap, char *);
while (el != NULL && list != NULL) {
is_string(el, list->data, "list element matches");
list = list->next;
el = va_arg(ap, char *);
}
if (el == NULL && list == NULL) {
ok(1, "List has correct number of elements");
} else if (el == NULL) {
ok(0, "List has too many elements");
} else if (list == NULL) {
ok(0, "List has too few elements");
}
}
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
int
main(int argc, char **argv)
{
char *tv[100];
struct cmd_syndesc *opts;
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
struct cmd_syndesc *retopts;
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
struct cmd_item *list;
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
int code;
int tc;
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
int retval;
cmd: Add support for pulling options from files With this change, we gain the ability to set our command line options from krb5.conf configuration files. This is only available for tools which are implemented using the new cmd_OptionAs accessor methods. Callers should load their configuration file using cmd_OpenConfigFile("/path/to/config/file.conf"); (an addition to libauth to return a path to a system wide configuration file will be forthcoming) and then set their command name (for example, "fileserver", "afsd", "vos" and so on) using cmd_SetCommandName("mycommand"); The accessor functions will then populate their return values with either: a) The command line options, if specified b) The contents of the tag matching the option name, in the [command_subcommand] section of the configuration file, if it exists c) The contents of the same tag, in the [command] section of the configuration file, if it that exists. d) The contents of the same tag in the [defaults] section of the configuration file. Callers can also gain access to the entire configuration file by calling cmd_RawFile, or to just the section corresponding to their command line by calling cmd_RawSection. Note that when using the file directly, it is up to callers to preserve consistency by implementing similar inheritance rules as the above. Change-Id: Ic501ab296af3638f961486869af79c9ce47b77b8 Reviewed-on: http://gerrit.openafs.org/7135 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-10-09 01:20:57 +01:00
char *path;
cmd tests: Initialise string retval The cmd_OptionAsString function attempts to free the previous value of the string passed to it. Make sure that we initialise the return value to NULL before passing it in in the test suite. Change-Id: I8500d5e6812f4d1655fc50618db472c745604e41 Reviewed-on: http://gerrit.openafs.org/4653 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-24 20:29:37 +01:00
char *retstring = NULL;
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd: Add support for pulling options from files With this change, we gain the ability to set our command line options from krb5.conf configuration files. This is only available for tools which are implemented using the new cmd_OptionAs accessor methods. Callers should load their configuration file using cmd_OpenConfigFile("/path/to/config/file.conf"); (an addition to libauth to return a path to a system wide configuration file will be forthcoming) and then set their command name (for example, "fileserver", "afsd", "vos" and so on) using cmd_SetCommandName("mycommand"); The accessor functions will then populate their return values with either: a) The command line options, if specified b) The contents of the tag matching the option name, in the [command_subcommand] section of the configuration file, if it exists c) The contents of the same tag, in the [command] section of the configuration file, if it that exists. d) The contents of the same tag in the [defaults] section of the configuration file. Callers can also gain access to the entire configuration file by calling cmd_RawFile, or to just the section corresponding to their command line by calling cmd_RawSection. Note that when using the file directly, it is up to callers to preserve consistency by implementing similar inheritance rules as the above. Change-Id: Ic501ab296af3638f961486869af79c9ce47b77b8 Reviewed-on: http://gerrit.openafs.org/7135 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-10-09 01:20:57 +01:00
plan(109);
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
initialize_CMD_error_table();
opts = cmd_CreateSyntax(NULL, testproc, NULL, NULL);
tests: Make -flag the first parm in command-t Move the -flag parameter to be the first parameter, to test more of the positional argument handling. Change-Id: I637c58e8c76bfc23919f29a1c598084275426773 Reviewed-on: http://gerrit.openafs.org/4710 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-05-23 23:04:20 +01:00
cmd_AddParm(opts, "-flag", CMD_FLAG, CMD_OPTIONAL, "a flag");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_AddParm(opts, "-first", CMD_SINGLE, CMD_REQUIRED, "first option");
cmd_AddParm(opts, "-second", CMD_LIST, CMD_OPTIONAL, "second option");
/* A simple command line */
code = cmd_ParseLine("-first foo -second bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(0, code, "dispatching simple comamnd line succeeds");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "parsing simple command line succeeds");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
is_string("foo", retopts->parms[copt_first].items->data,
" ... 1st option matches");
is_string("bar", retopts->parms[copt_second].items->data,
" ... 2nd option matches");
ok(retopts->parms[copt_flag].items != NULL, " ... 3rd option matches");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
cmd_FreeOptions(&retopts);
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* unknown switch */
code = cmd_ParseLine("-first foo -second bar -third -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_UNKNOWNSWITCH, code, "invalid options fail as expected");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_UNKNOWNSWITCH, code, "and still fail with cmd_Parse");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* missing parameter */
code = cmd_ParseLine("-first foo -second -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_TOOFEW, code, "missing parameters fail as expected");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_TOOFEW, code, "and still fail with cmd_Parse");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* missing option */
code = cmd_ParseLine("-second bar -third -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_UNKNOWNSWITCH, code, "missing options fail as expected");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_UNKNOWNSWITCH, code, "and still fail with cmd_Parse");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
code = cmd_ParseLine("-first foo baz -second bar -third -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_NOTLIST, code, "too many parameters fails as expected");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_NOTLIST, code, "and still fail with cmd_Parse");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* Positional parameters */
code = cmd_ParseLine("foo bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(0, code, "dispatching positional parameters succeeds");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "and works with cmd_Parse");
cmd_FreeOptions(&retopts);
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* Abbreviations */
code = cmd_ParseLine("-fi foo -s bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(0, code, "dispatching abbreviations succeeds");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "and works with cmd_Parse");
cmd_FreeOptions(&retopts);
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
/* Ambiguous */
code = cmd_ParseLine("-f foo -s bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_UNKNOWNSWITCH, code, "ambiguous abbreviations correctly fail");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_UNKNOWNSWITCH, code, "and fail with cmd_Parse too");
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
cmd_FreeArgv(tv);
cmd: Add support for disabling specific abbrevs Sometimes, when adding a new command parameter, it's necessary to prevent it from colliding with an existing abbreviation. This patch adds a new command flag CMD_NOABBRV which can be set on a parameter to indicate that it should not be considered when checking for ambiguous abbreviations. For example, if a command has the existing '-cell' option which is popularly abbreviated to '-c', adding a '-config' option would cause the existing abbreviation to stop working. However, if '-config' is added with the NOABBRV flag set, '-c' will continue to work. Change-Id: I3b6d718f9dd81c44fb1d10c904db6a4a0fd763b8 Reviewed-on: http://gerrit.openafs.org/4810 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Jeffrey Altman <jaltman@openafs.org> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-05-30 20:02:31 +01:00
/* Check that paramaters with abbreviation disabled don't make things
* ambiguous */
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
cmd_AddParmAtOffset(opts, copt_sugar, "-sugar", CMD_SINGLE,
CMD_OPTIONAL | CMD_NOABBRV, "sugar with that");
cmd: Add support for disabling specific abbrevs Sometimes, when adding a new command parameter, it's necessary to prevent it from colliding with an existing abbreviation. This patch adds a new command flag CMD_NOABBRV which can be set on a parameter to indicate that it should not be considered when checking for ambiguous abbreviations. For example, if a command has the existing '-cell' option which is popularly abbreviated to '-c', adding a '-config' option would cause the existing abbreviation to stop working. However, if '-config' is added with the NOABBRV flag set, '-c' will continue to work. Change-Id: I3b6d718f9dd81c44fb1d10c904db6a4a0fd763b8 Reviewed-on: http://gerrit.openafs.org/4810 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Jeffrey Altman <jaltman@openafs.org> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-05-30 20:02:31 +01:00
code = cmd_ParseLine("-fi foo -s bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(0, code, "disabling specific abbreviations succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "and works with cmd_Parse into the bargain");
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
cmd: Add function to disable positional commands Add a new cmd_DisablePositionalCommands function which can be used to completely disable positional commands, for functions which have no desire to make use of them. Change-Id: I5646e9976e544f06902ea6f85043a6330b1ac2fe Reviewed-on: http://gerrit.openafs.org/4539 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-18 08:25:55 +01:00
/* Disable positional commands */
cmd_DisablePositionalCommands();
code = cmd_ParseLine("foo bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
is_int(CMD_NOTLIST, code, "positional parameters can be disabled");
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_NOTLIST, code, "and fail with cmd_Parse too");
cmd: Add function to disable positional commands Add a new cmd_DisablePositionalCommands function which can be used to completely disable positional commands, for functions which have no desire to make use of them. Change-Id: I5646e9976e544f06902ea6f85043a6330b1ac2fe Reviewed-on: http://gerrit.openafs.org/4539 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-18 08:25:55 +01:00
cmd_FreeArgv(tv);
cmd: Add an option to disable abbreviations Add an option to completely disable the matching of abbreviations when parsing command line options. Change-Id: Ic3babf584c21f389503c9c69670d400d54a6f4a6 Reviewed-on: http://gerrit.openafs.org/4540 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-18 08:31:42 +01:00
/* Disable abbreviations */
cmd_DisableAbbreviations();
code = cmd_ParseLine("-fi foo -s bar -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Dispatch(tc, tv);
is_int(CMD_UNKNOWNSWITCH, code, "dispatching abbreviations succeeds");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_UNKNOWNSWITCH, code, "and fail with cmd_Parse too");
cmd_FreeArgv(tv);
/* Try the new cmd_Parse function with something different*/
code = cmd_ParseLine("-first one -second two -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "Parsing with cmd_Parse works");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
is_string("one", retopts->parms[copt_first].items->data,
" ... 1st option matches");
is_string("two", retopts->parms[copt_second].items->data,
" ... 2nd option matches");
cmd: Add support for pulling options from files With this change, we gain the ability to set our command line options from krb5.conf configuration files. This is only available for tools which are implemented using the new cmd_OptionAs accessor methods. Callers should load their configuration file using cmd_OpenConfigFile("/path/to/config/file.conf"); (an addition to libauth to return a path to a system wide configuration file will be forthcoming) and then set their command name (for example, "fileserver", "afsd", "vos" and so on) using cmd_SetCommandName("mycommand"); The accessor functions will then populate their return values with either: a) The command line options, if specified b) The contents of the tag matching the option name, in the [command_subcommand] section of the configuration file, if it exists c) The contents of the same tag, in the [command] section of the configuration file, if it that exists. d) The contents of the same tag in the [defaults] section of the configuration file. Callers can also gain access to the entire configuration file by calling cmd_RawFile, or to just the section corresponding to their command line by calling cmd_RawSection. Note that when using the file directly, it is up to callers to preserve consistency by implementing similar inheritance rules as the above. Change-Id: Ic501ab296af3638f961486869af79c9ce47b77b8 Reviewed-on: http://gerrit.openafs.org/7135 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-10-09 01:20:57 +01:00
ok(retopts->parms[copt_flag].items != NULL,
" ... 3rd option matches");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
cmd: Add option to add a param at a specific pos Rather than having to use cmd_Seek, followed by cmd_AddParam, followed by another cmd_Seek, add a function which permits parameters to be added at specific reference points. This allows programs to declare a list (either as an enum or specific #defines) of parameter code points, rather than using raw numbers. Change-Id: I25c0d501e678aa2818d296c776d8c5d03b8cdabe Reviewed-on: http://gerrit.openafs.org/4542 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 09:01:25 +01:00
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
/* Try adding a couple of parameters at specific positions */
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
cmd_AddParmAtOffset(opts, copt_fifth, "-fifth", CMD_SINGLE, CMD_OPTIONAL,
cmd: Reorder cmd_AddParmAtOffset arguments Reorder the arguments of this recently introduced function to make client code more readable. Change-Id: I37f662f849bd96176230f75783e2a1c62d94b8c9 Reviewed-on: http://gerrit.openafs.org/4755 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk> Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
2011-05-30 19:23:49 +01:00
"fifth option");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
cmd_AddParmAtOffset(opts, copt_fourth, "-fourth", CMD_SINGLE, CMD_OPTIONAL,
cmd: Reorder cmd_AddParmAtOffset arguments Reorder the arguments of this recently introduced function to make client code more readable. Change-Id: I37f662f849bd96176230f75783e2a1c62d94b8c9 Reviewed-on: http://gerrit.openafs.org/4755 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk> Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
2011-05-30 19:23:49 +01:00
"fourth option" );
cmd: Add option to add a param at a specific pos Rather than having to use cmd_Seek, followed by cmd_AddParam, followed by another cmd_Seek, add a function which permits parameters to be added at specific reference points. This allows programs to declare a list (either as an enum or specific #defines) of parameter code points, rather than using raw numbers. Change-Id: I25c0d501e678aa2818d296c776d8c5d03b8cdabe Reviewed-on: http://gerrit.openafs.org/4542 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 09:01:25 +01:00
code = cmd_ParseLine("-first a -fourth b -fifth c", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "parsing our new options succeeds");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
is_string("b", retopts->parms[copt_fourth].items->data,
" Fourth option in right place");
is_string("c", retopts->parms[copt_fifth].items->data,
" Fifth option in right place");
cmd: Split up dispatch function Split up the command line parsing behaviour out of the cmd_Dispatch function, and into a function of its own - cmd_Parse. This lets servers which only have a single "syntax" installed just parse, without needing to go through a dispatch function, and all of the control flow complexity that requires. Change-Id: Ic4325bf933ee5b28cb80db36ef9b2b5fb6763f41 Reviewed-on: http://gerrit.openafs.org/4541 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 11:47:08 +01:00
cmd_FreeOptions(&retopts);
cmd: Add an option to disable abbreviations Add an option to completely disable the matching of abbreviations when parsing command line options. Change-Id: Ic3babf584c21f389503c9c69670d400d54a6f4a6 Reviewed-on: http://gerrit.openafs.org/4540 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-18 08:31:42 +01:00
cmd_FreeArgv(tv);
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
/* Check Accessors */
code = cmd_ParseLine("-first 1 -second second -flag", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsInt(retopts, copt_first, &retval);
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
is_int(0, code, "cmd_OptionsAsInt succeeds");
is_int(1, retval, " ... and returns correct value");
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
ok(cmd_OptionPresent(retopts, copt_first),
" ... and is marked as present");
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsString(retopts, copt_second, &retstring);
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
is_int(0, code, "cmd_OptionsAsString succeeds");
is_string("second", retstring, " ... and returns correct value");
free(retstring);
retstring = NULL;
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
ok(cmd_OptionPresent(retopts, copt_second),
" ... and is marked as present");
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsFlag(retopts, copt_flag, &retval);
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
is_int(0, code, "cmd_OptionsAsFlag succeeds");
ok(retval, " ... and flag is correct");
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
ok(cmd_OptionPresent(retopts, copt_flag),
" ... and is marked as present");
ok(!cmd_OptionPresent(retopts, copt_sugar),
"Missing option is marked as such");
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
cmd: Add parameter aliasing Add support for adding aliases for parameters, in the same way as we can for syntaxes. This allows multiple different names for a single option, as well as providing a way around problems with abbreviations. Aliases may not be abbreviated. Change-Id: I5c440cf006cd5fd0065ecf1e54213745428063f7 Reviewed-on: http://gerrit.openafs.org/4544 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 12:20:14 +01:00
/* Add an alias */
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_AddParmAlias(opts, copt_second, "-twa");
cmd: Add parameter aliasing Add support for adding aliases for parameters, in the same way as we can for syntaxes. This allows multiple different names for a single option, as well as providing a way around problems with abbreviations. Aliases may not be abbreviated. Change-Id: I5c440cf006cd5fd0065ecf1e54213745428063f7 Reviewed-on: http://gerrit.openafs.org/4544 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 12:20:14 +01:00
is_int(0, code, "cmd_AddParmAlias succeeds");
code = cmd_ParseLine("-first 1 -twa tup", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds for alias");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
cmd_OptionAsString(retopts, copt_second, &retstring);
cmd: Add parameter aliasing Add support for adding aliases for parameters, in the same way as we can for syntaxes. This allows multiple different names for a single option, as well as providing a way around problems with abbreviations. Aliases may not be abbreviated. Change-Id: I5c440cf006cd5fd0065ecf1e54213745428063f7 Reviewed-on: http://gerrit.openafs.org/4544 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 12:20:14 +01:00
is_string("tup", retstring, " ... and we have the correct value");
free(retstring);
retstring = NULL;
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
cmd: Add accessor functions for options Add a load of accessor functions to help with pulling values out from the the cmd_syndesc structure. The idea here is to make it simpler to manipulate command line values, as well as starting to hide the structure of the cmd_syndesc structure from callers, with a view to eventually making it private to the cmd library. Change-Id: I38757d776364ceacd43e98fda16e995da35da65c Reviewed-on: http://gerrit.openafs.org/4543 Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-04-19 11:41:54 +01:00
cmd: Add support for params with optional values Add the CMD_SINGLE_OR_FLAG option which permits a parameter to either have a single value, or no value at all. If it has no value, then it behaves in the same way as the current 'flag' implementation. Change-Id: I49cf313f1d3b9c369f87b1ff66bfcc038b8aa08a Reviewed-on: http://gerrit.openafs.org/4545 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:37:37 +01:00
/* Add something that can be a flag or a value, and put something after
* it so we can check for parse problems*/
cmd_AddParm(opts, "-perhaps", CMD_SINGLE_OR_FLAG, CMD_OPTIONAL,
"what am I");
cmd_AddParm(opts, "-sanity", CMD_SINGLE, CMD_OPTIONAL, "sanity check");
/* Try using as an option */
code = cmd_ParseLine("-first 1 -perhaps 2 -sanity 3", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds for option-as-flag as opt");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsInt(retopts, copt_perhaps, &retval);
cmd: Add support for params with optional values Add the CMD_SINGLE_OR_FLAG option which permits a parameter to either have a single value, or no value at all. If it has no value, then it behaves in the same way as the current 'flag' implementation. Change-Id: I49cf313f1d3b9c369f87b1ff66bfcc038b8aa08a Reviewed-on: http://gerrit.openafs.org/4545 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:37:37 +01:00
is_int(0, code, "cmd_OptionAsInt succeeds");
is_int(2, retval, " ... and we have the correct value");
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
/* And now, as a flag */
code = cmd_ParseLine("-first 1 -perhaps -sanity 3", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds for option-as-flag as flag");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsInt(retopts, copt_perhaps, &retval);
cmd: Add support for params with optional values Add the CMD_SINGLE_OR_FLAG option which permits a parameter to either have a single value, or no value at all. If it has no value, then it behaves in the same way as the current 'flag' implementation. Change-Id: I49cf313f1d3b9c369f87b1ff66bfcc038b8aa08a Reviewed-on: http://gerrit.openafs.org/4545 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:37:37 +01:00
is_int(CMD_MISSING, code, " ... pulling out a value fails as expected");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
cmd_OptionAsFlag(retopts, copt_perhaps, &retval);
cmd: Add support for params with optional values Add the CMD_SINGLE_OR_FLAG option which permits a parameter to either have a single value, or no value at all. If it has no value, then it behaves in the same way as the current 'flag' implementation. Change-Id: I49cf313f1d3b9c369f87b1ff66bfcc038b8aa08a Reviewed-on: http://gerrit.openafs.org/4545 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:37:37 +01:00
ok(retval, " ... but parsing as a flag works");
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
cmd: Tidy up -help output Tidy up the output that comes from cmd's -help option by wrapping at 78 characters, and picking the breaks sensibly. This changes: Usage: ./vos move -id <volume name or ID> -fromserver <machine name on source> - frompartition <partition name on source> -toserver <machine name on destination> -topartition <partition name on destination> [-live] [-cell <cell name>] [-noau th] [-localauth] [-verbose] [-encrypt] [-noresolve] [-help] to... Usage: ./vos move -id <volume name or ID> -fromserver <machine name on source> -frompartition <partition name on source> -toserver <machine name on destination> -topartition <partition name on destination> [-live] [-cell <cell name>] [-noauth] [-localauth] [-verbose] [-encrypt] [-noresolve] [-help] Change-Id: I494c287a9370d052763b464df33e69a936edef71 Reviewed-on: http://gerrit.openafs.org/4546 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:59:13 +01:00
/* Check that we can produce help output */
code = cmd_ParseLine("-help", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(CMD_USAGE, code, "cmd_Parse returns usage error with help output");
ok(retopts == NULL, " ... and options is empty");
cmd: Support splitting switches and values with '=' Some of our code uses arguments of the form -name=value. Add support to libcmd for dealing with this type of argument, where name is declared as CMD_SINGLE (or CMD_SINGLE_OR_FLAG) Change-Id: Ifb7486abc4f6bf26594936ef11749c4fe29a2e9b Reviewed-on: http://gerrit.openafs.org/4547 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-20 22:26:14 +01:00
/* Check splitting with '=' */
code = cmd_ParseLine("-first 1 -perhaps=6 -sanity=3", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds for items split with '='");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsInt(retopts, copt_perhaps, &retval);
cmd: Support splitting switches and values with '=' Some of our code uses arguments of the form -name=value. Add support to libcmd for dealing with this type of argument, where name is declared as CMD_SINGLE (or CMD_SINGLE_OR_FLAG) Change-Id: Ifb7486abc4f6bf26594936ef11749c4fe29a2e9b Reviewed-on: http://gerrit.openafs.org/4547 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-20 22:26:14 +01:00
is_int(0, code, "cmd_OptionAsInt succeeds");
is_int(6, retval, " ... and we have the correct value once");
tests: Use enum rather than #defines for tests Change the command test so that it uses an enum, rather than #defines for offsets into the parms array. This is mainly a cosmetic change, but brings the test suite into line with the way that we're doing stuff in the "real" code. Change-Id: Ia9d72e13230edd4fe13af52ba6816cf775693c36 Reviewed-on: http://gerrit.openafs.org/7133 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Tom Keiser <tkeiser@sinenomine.net> Reviewed-by: Derrick Brashear <shadow@dementix.org>
2011-10-08 23:33:37 +01:00
code = cmd_OptionAsInt(retopts, copt_sanity, &retval);
cmd: Support splitting switches and values with '=' Some of our code uses arguments of the form -name=value. Add support to libcmd for dealing with this type of argument, where name is declared as CMD_SINGLE (or CMD_SINGLE_OR_FLAG) Change-Id: Ifb7486abc4f6bf26594936ef11749c4fe29a2e9b Reviewed-on: http://gerrit.openafs.org/4547 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-20 22:26:14 +01:00
is_int(0, code, "cmd_OptionAsInt succeeds");
is_int(3, retval, " ... and we have the correct value twice");
cmd_FreeOptions(&retopts);
cmd: Tidy up -help output Tidy up the output that comes from cmd's -help option by wrapping at 78 characters, and picking the breaks sensibly. This changes: Usage: ./vos move -id <volume name or ID> -fromserver <machine name on source> - frompartition <partition name on source> -toserver <machine name on destination> -topartition <partition name on destination> [-live] [-cell <cell name>] [-noau th] [-localauth] [-verbose] [-encrypt] [-noresolve] [-help] to... Usage: ./vos move -id <volume name or ID> -fromserver <machine name on source> -frompartition <partition name on source> -toserver <machine name on destination> -topartition <partition name on destination> [-live] [-cell <cell name>] [-noauth] [-localauth] [-verbose] [-encrypt] [-noresolve] [-help] Change-Id: I494c287a9370d052763b464df33e69a936edef71 Reviewed-on: http://gerrit.openafs.org/4546 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-19 19:59:13 +01:00
cmd_FreeArgv(tv);
tests: Add additional cmd tests Add additional tests to the libcmd test suite to verify the behaviour of cmd_OptionPresent and cmd_OptionAsList Change-Id: I81a235fb5ee87682c72ca942f1341f77be6fda39 Reviewed-on: http://gerrit.openafs.org/7392 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2012-05-10 16:51:01 +01:00
/* Check list behaviour */
code = cmd_ParseLine("-first 1 -second one two three", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds for a list");
code = cmd_OptionAsList(retopts, copt_second, &list);
is_int(0, code, "cmd_OptionAsList succeeds");
checkList(list, "one", "two", "three", NULL);
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
cmd: Add support for pulling options from files With this change, we gain the ability to set our command line options from krb5.conf configuration files. This is only available for tools which are implemented using the new cmd_OptionAs accessor methods. Callers should load their configuration file using cmd_OpenConfigFile("/path/to/config/file.conf"); (an addition to libauth to return a path to a system wide configuration file will be forthcoming) and then set their command name (for example, "fileserver", "afsd", "vos" and so on) using cmd_SetCommandName("mycommand"); The accessor functions will then populate their return values with either: a) The command line options, if specified b) The contents of the tag matching the option name, in the [command_subcommand] section of the configuration file, if it exists c) The contents of the same tag, in the [command] section of the configuration file, if it that exists. d) The contents of the same tag in the [defaults] section of the configuration file. Callers can also gain access to the entire configuration file by calling cmd_RawFile, or to just the section corresponding to their command line by calling cmd_RawSection. Note that when using the file directly, it is up to callers to preserve consistency by implementing similar inheritance rules as the above. Change-Id: Ic501ab296af3638f961486869af79c9ce47b77b8 Reviewed-on: http://gerrit.openafs.org/7135 Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: BuildBot <buildbot@rampaginggeek.com>
2011-10-09 01:20:57 +01:00
/* Now, try adding a configuration file into the mix */
if (getenv("SOURCE") == NULL)
path = strdup("test1.conf");
else
asprintf(&path, "%s/command/test1.conf", getenv("SOURCE"));
cmd_SetCommandName("test");
code = cmd_OpenConfigFile(path);
is_int(0, code, "cmd_OpenConfigFile succeeds");
code = cmd_ParseLine("-first 1", tv, &tc, 100);
is_int(0, code, "cmd_ParseLine succeeds");
code = cmd_Parse(tc, tv, &retopts);
is_int(0, code, "cmd_Parse succeeds when we have a config file");
code = cmd_OptionAsInt(retopts, copt_perhaps, &retval);
is_int(0, code, "cmd_OptionsAsInt succeeds");
is_int(10, retval, " ... and we have the correct value for perhaps");
code = cmd_OptionAsString(retopts, copt_sanity, &retstring);
is_int(0, code, "cmd_OptionAsString succeeds");
is_string("testing", retstring,
" ... and we have the correct value for sanity");
/* Check breaking up a list of options */
code = cmd_OptionAsList(retopts, copt_second, &list);
is_int(0, code, "cmd_OptionAsList succeeds");
checkList(list, "one", "two", "three", "four", NULL);
cmd: Add some tests to the test suite Add some tests for the command library to the integrated test suite in tests. These are far from complete, and are mainly there to ensure that we don't break any of this functionality when modifying the library. Change-Id: Ib6fbdca114c005c32c5ba8c41f9e350ca67e1fb8 Reviewed-on: http://gerrit.openafs.org/4538 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-23 16:42:54 +01:00
return 0;
}
cmd: Add function to disable positional commands Add a new cmd_DisablePositionalCommands function which can be used to completely disable positional commands, for functions which have no desire to make use of them. Change-Id: I5646e9976e544f06902ea6f85043a6330b1ac2fe Reviewed-on: http://gerrit.openafs.org/4539 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
2011-04-18 08:25:55 +01:00
Reference in New Issue Copy Permalink