skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Allow verbose and scoped tests output.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-03 16:19:14 -04:00
parent 831b475b28
commit a7f82d3148
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform-independent/cli-c/cli/mpw-cli.c
View File

@ -34,14 +34,14 @@
static void usage() {
inf( ""
" Master Password v%s\n"
" Master Password v%s - CLI\n"
"--------------------------------------------------------------------------------\n"
" https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) );
inf( ""
"\nUSAGE\n\n"
" mpw [-u|-U full-name] [-m fd] [-t pw-type] [-P value] [-c counter]\n"
" [-a version] [-p purpose] [-C context] [-f|F format] [-R 0|1]\n"
" [-v|-q] [-h] [site-name]\n" );
" [-v|-q]* [-h] [site-name]\n" );
inf( ""
" -u full-name Specify the full name of the user.\n"
" -u checks the master password against the config,\n"
@ -110,6 +110,8 @@ static void usage() {
" -q Decrease output verbosity (can be repeated).\n" );
inf( ""
" -h Show this help output instead of performing any operation.\n" );
inf( ""
" site-name Name of the site for which to generate a token.\n" );
inf( ""
"\nENVIRONMENT\n\n"
" %-12s The full name of the user (see -u).\n"

54
platform-independent/cli-c/cli/mpw-tests.c
View File

@ -16,8 +16,13 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
#define _POSIX_C_SOURCE 200809L
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sysexits.h>
#ifndef mpw_log_do
#define mpw_log_do(level, format, ...) ({ \
@ -32,8 +37,48 @@
#include "mpw-tests-util.h"
/** Output the program's usage documentation. */
static void usage() {
inf( ""
" Master Password v%s - Tests\n"
"--------------------------------------------------------------------------------\n"
" https://masterpasswordapp.com\n", stringify_def( MP_VERSION ) );
inf( ""
"\nUSAGE\n\n"
" mpw-tests [-v|-q]* [-h] [test-name ...]\n" );
inf( ""
" -v Increase output verbosity (can be repeated).\n"
" -q Decrease output verbosity (can be repeated).\n" );
inf( ""
" -h Show this help output instead of performing any operation.\n" );
inf( ""
" test-name Only run tests whose identifier starts with one of the these.\n" );
exit( EX_OK );
}
int main(int argc, char *const argv[]) {
for (int opt; (opt = getopt( argc, argv, "vqh" )) != EOF;
optarg? mpw_zero( optarg, strlen( optarg ) ): (void)0)
switch (opt) {
case 'v':
++mpw_verbosity;
break;
case 'q':
--mpw_verbosity;
break;
case 'h':
usage();
break;
case '?':
ftl( "Unknown option: -%c", optopt );
exit( EX_USAGE );
default:
ftl( "Unexpected option: %c", opt );
exit( EX_USAGE );
}
int failedTests = 0;
xmlNodePtr tests = xmlDocGetRootElement( xmlParseFile( "mpw_tests.xml" ) );
@ -64,6 +109,15 @@ int main(int argc, char *const argv[]) {
// Run the test case.
do {
if (optind < argc) {
bool selected = false;
for (int a = optind; !selected && a <= argc; ++a)
if (strstr((char *)id, argv[optind]) == (char *)id)
selected = true;
if (!selected)
continue;
}
fprintf( stdout, "test case %s... ", id );
if (!xmlStrlen( result )) {
fprintf( stdout, "abstract." );

2
platform-independent/cli-c/core
View File

@ -1 +1 @@
../../core/c
../../core/c/src