From 859b581454794544da3ce409ef4f0c36c5b0f1a7 Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 28 Dec 2014 15:07:52 +0000 Subject: [PATCH] Update regress to match change in unnamed argument handling. --- regress/usr.bin/openssl/options/optionstest.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/regress/usr.bin/openssl/options/optionstest.c b/regress/usr.bin/openssl/options/optionstest.c index adfd49b4152..297cf8506fb 100644 --- a/regress/usr.bin/openssl/options/optionstest.c +++ b/regress/usr.bin/openssl/options/optionstest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optionstest.c,v 1.2 2014/12/28 14:22:46 jsing Exp $ */ +/* $OpenBSD: optionstest.c,v 1.3 2014/12/28 15:07:52 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -38,11 +38,13 @@ static struct { static struct option test_options[] = { { .name = "arg", + .argname = "argname", .type = OPTION_ARG, .opt.arg = &test_config.arg, }, { .name = "argfunc", + .argname = "argname", .type = OPTION_ARG_FUNC, .opt.argfunc = argfunc, }, @@ -132,14 +134,11 @@ struct options_test options_tests[] = { .wantflag = 1, }, { - /* Multiple unnamed arguments (retain last). */ + /* Multiple unnamed arguments (should fail). */ .argc = 6, .argv = args5, .type = OPTIONS_TEST_UNNAMED, - .unnamed = "unnamed2", - .want = 0, - .wantarg = "arg", - .wantflag = 1, + .want = 1, }, { /* Function. */ -- 2.20.1