summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-12-28 15:07:52 +0000
committerjsing <>2014-12-28 15:07:52 +0000
commite4c7f4f3a5e8f184315c03f7e5313a6caf8e5be6 (patch)
tree71ae7c50012c276d10be18f78e0c5b4cc4e58180
parentd8305be6ba1372703dfaf4367194e2db3fe2cf07 (diff)
downloadopenbsd-e4c7f4f3a5e8f184315c03f7e5313a6caf8e5be6.tar.gz
openbsd-e4c7f4f3a5e8f184315c03f7e5313a6caf8e5be6.tar.bz2
openbsd-e4c7f4f3a5e8f184315c03f7e5313a6caf8e5be6.zip
Update regress to match change in unnamed argument handling.
-rw-r--r--src/regress/usr.bin/openssl/options/optionstest.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/regress/usr.bin/openssl/options/optionstest.c b/src/regress/usr.bin/openssl/options/optionstest.c
index adfd49b415..297cf8506f 100644
--- a/src/regress/usr.bin/openssl/options/optionstest.c
+++ b/src/regress/usr.bin/openssl/options/optionstest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: optionstest.c,v 1.2 2014/12/28 14:22:46 jsing Exp $ */ 1/* $OpenBSD: optionstest.c,v 1.3 2014/12/28 15:07:52 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -38,11 +38,13 @@ static struct {
38static struct option test_options[] = { 38static struct option test_options[] = {
39 { 39 {
40 .name = "arg", 40 .name = "arg",
41 .argname = "argname",
41 .type = OPTION_ARG, 42 .type = OPTION_ARG,
42 .opt.arg = &test_config.arg, 43 .opt.arg = &test_config.arg,
43 }, 44 },
44 { 45 {
45 .name = "argfunc", 46 .name = "argfunc",
47 .argname = "argname",
46 .type = OPTION_ARG_FUNC, 48 .type = OPTION_ARG_FUNC,
47 .opt.argfunc = argfunc, 49 .opt.argfunc = argfunc,
48 }, 50 },
@@ -132,14 +134,11 @@ struct options_test options_tests[] = {
132 .wantflag = 1, 134 .wantflag = 1,
133 }, 135 },
134 { 136 {
135 /* Multiple unnamed arguments (retain last). */ 137 /* Multiple unnamed arguments (should fail). */
136 .argc = 6, 138 .argc = 6,
137 .argv = args5, 139 .argv = args5,
138 .type = OPTIONS_TEST_UNNAMED, 140 .type = OPTIONS_TEST_UNNAMED,
139 .unnamed = "unnamed2", 141 .want = 1,
140 .want = 0,
141 .wantarg = "arg",
142 .wantflag = 1,
143 }, 142 },
144 { 143 {
145 /* Function. */ 144 /* Function. */