diff options
Diffstat (limited to 'lib/tests/test_opts.c')
-rw-r--r-- | lib/tests/test_opts.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts.c index 7c173f30..54210fba 100644 --- a/lib/tests/test_opts.c +++ b/lib/tests/test_opts.c | |||
@@ -18,8 +18,8 @@ | |||
18 | *****************************************************************************/ | 18 | *****************************************************************************/ |
19 | 19 | ||
20 | #include "common.h" | 20 | #include "common.h" |
21 | #include "extra_opts.h" | ||
22 | #include "utils_base.h" | 21 | #include "utils_base.h" |
22 | #include "extra_opts.h" | ||
23 | 23 | ||
24 | #include "tap.h" | 24 | #include "tap.h" |
25 | 25 | ||
@@ -119,7 +119,7 @@ main (int argc, char **argv) | |||
119 | argv_known[2] = "--something else=oops"; | 119 | argv_known[2] = "--something else=oops"; |
120 | argv_known[3] = "--this=that"; | 120 | argv_known[3] = "--this=that"; |
121 | argv_known[4] = NULL; | 121 | argv_known[4] = NULL; |
122 | argv_test=np_extra_opts(argc_test, argv_test, "check_disk"); | 122 | argv_test=np_extra_opts(&argc_test, argv_test, "check_disk"); |
123 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts specified twice"); | 123 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts specified twice"); |
124 | my_free(&argc_test,argv_test); | 124 | my_free(&argc_test,argv_test); |
125 | 125 | ||
@@ -141,7 +141,7 @@ main (int argc, char **argv) | |||
141 | argv_known[5] = "--arg1=val1"; | 141 | argv_known[5] = "--arg1=val1"; |
142 | argv_known[6] = "--arg2"; | 142 | argv_known[6] = "--arg2"; |
143 | argv_known[7] = NULL; | 143 | argv_known[7] = NULL; |
144 | argv_test=np_extra_opts(argc_test, argv_test, "check_disk"); | 144 | argv_test=np_extra_opts(&argc_test, argv_test, "check_disk"); |
145 | ok(array_diff(argc_test, argv_test, 7, argv_known), "twice extra opts using two sections"); | 145 | ok(array_diff(argc_test, argv_test, 7, argv_known), "twice extra opts using two sections"); |
146 | my_free(&argc_test,argv_test); | 146 | my_free(&argc_test,argv_test); |
147 | 147 | ||
@@ -162,7 +162,7 @@ main (int argc, char **argv) | |||
162 | argv_known[2] = "--arg3"; | 162 | argv_known[2] = "--arg3"; |
163 | argv_known[3] = "val2"; | 163 | argv_known[3] = "val2"; |
164 | argv_known[4] = NULL; | 164 | argv_known[4] = NULL; |
165 | argv_test=np_extra_opts(argc_test, argv_test, "check_missing"); | 165 | argv_test=np_extra_opts(&argc_test, argv_test, "check_missing"); |
166 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 1"); | 166 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 1"); |
167 | my_free(&argc_test,argv_test); | 167 | my_free(&argc_test,argv_test); |
168 | 168 | ||
@@ -181,7 +181,7 @@ main (int argc, char **argv) | |||
181 | argv_known[2] = "--arg3"; | 181 | argv_known[2] = "--arg3"; |
182 | argv_known[3] = "val2"; | 182 | argv_known[3] = "val2"; |
183 | argv_known[4] = NULL; | 183 | argv_known[4] = NULL; |
184 | argv_test=np_extra_opts(argc_test, argv_test, "check_missing"); | 184 | argv_test=np_extra_opts(&argc_test, argv_test, "check_missing"); |
185 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 2"); | 185 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 2"); |
186 | my_free(&argc_test,argv_test); | 186 | my_free(&argc_test,argv_test); |
187 | 187 | ||
@@ -199,7 +199,7 @@ main (int argc, char **argv) | |||
199 | argv_known[2] = "--arg3"; | 199 | argv_known[2] = "--arg3"; |
200 | argv_known[3] = "val2"; | 200 | argv_known[3] = "val2"; |
201 | argv_known[4] = NULL; | 201 | argv_known[4] = NULL; |
202 | argv_test=np_extra_opts(argc_test, argv_test, "check_missing"); | 202 | argv_test=np_extra_opts(&argc_test, argv_test, "check_missing"); |
203 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 3"); | 203 | ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 3"); |
204 | my_free(&argc_test,argv_test); | 204 | my_free(&argc_test,argv_test); |
205 | 205 | ||
@@ -219,7 +219,7 @@ main (int argc, char **argv) | |||
219 | argv_known[3] = "--arg3"; | 219 | argv_known[3] = "--arg3"; |
220 | argv_known[4] = "val2"; | 220 | argv_known[4] = "val2"; |
221 | argv_known[5] = NULL; | 221 | argv_known[5] = NULL; |
222 | argv_test=np_extra_opts(argc_test, argv_test, "check_disk"); | 222 | argv_test=np_extra_opts(&argc_test, argv_test, "check_disk"); |
223 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1"); | 223 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1"); |
224 | my_free(&argc_test,argv_test); | 224 | my_free(&argc_test,argv_test); |
225 | 225 | ||
@@ -238,7 +238,7 @@ main (int argc, char **argv) | |||
238 | argv_known[3] = "--arg3"; | 238 | argv_known[3] = "--arg3"; |
239 | argv_known[4] = "val2"; | 239 | argv_known[4] = "val2"; |
240 | argv_known[5] = NULL; | 240 | argv_known[5] = NULL; |
241 | argv_test=np_extra_opts(argc_test, argv_test, "check_disk"); | 241 | argv_test=np_extra_opts(&argc_test, argv_test, "check_disk"); |
242 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 2"); | 242 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 2"); |
243 | my_free(&argc_test,argv_test); | 243 | my_free(&argc_test,argv_test); |
244 | 244 | ||
@@ -257,7 +257,7 @@ main (int argc, char **argv) | |||
257 | argv_known[3] = "--arg3"; | 257 | argv_known[3] = "--arg3"; |
258 | argv_known[4] = "val2"; | 258 | argv_known[4] = "val2"; |
259 | argv_known[5] = NULL; | 259 | argv_known[5] = NULL; |
260 | argv_test=np_extra_opts(argc_test, argv_test, "check_disk"); | 260 | argv_test=np_extra_opts(&argc_test, argv_test, "check_disk"); |
261 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3"); | 261 | ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3"); |
262 | my_free(&argc_test,argv_test); | 262 | my_free(&argc_test,argv_test); |
263 | 263 | ||