diff options
Diffstat (limited to 'src/util/test_getopt.c')
-rw-r--r-- | src/util/test_getopt.c | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 8e578640d..16f2df8d1 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c | |||
@@ -56,7 +56,7 @@ testVerbose () | |||
56 | unsigned int vflags = 0; | 56 | unsigned int vflags = 0; |
57 | 57 | ||
58 | const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = { | 58 | const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = { |
59 | GNUNET_GETOPT_OPTION_VERBOSE (&vflags), | 59 | GNUNET_GETOPT_option_verbose (&vflags), |
60 | GNUNET_GETOPT_OPTION_END | 60 | GNUNET_GETOPT_OPTION_END |
61 | }; | 61 | }; |
62 | 62 | ||
@@ -83,7 +83,7 @@ testVersion () | |||
83 | NULL | 83 | NULL |
84 | }; | 84 | }; |
85 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { | 85 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { |
86 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), | 86 | GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION), |
87 | GNUNET_GETOPT_OPTION_END | 87 | GNUNET_GETOPT_OPTION_END |
88 | }; | 88 | }; |
89 | 89 | ||
@@ -105,7 +105,7 @@ testAbout () | |||
105 | NULL | 105 | NULL |
106 | }; | 106 | }; |
107 | const struct GNUNET_GETOPT_CommandLineOption aboutoptionlist[] = { | 107 | const struct GNUNET_GETOPT_CommandLineOption aboutoptionlist[] = { |
108 | GNUNET_GETOPT_OPTION_HELP ("Testing"), | 108 | GNUNET_GETOPT_option_help ("Testing"), |
109 | GNUNET_GETOPT_OPTION_END | 109 | GNUNET_GETOPT_OPTION_END |
110 | }; | 110 | }; |
111 | 111 | ||
@@ -131,18 +131,21 @@ testLogOpts () | |||
131 | char *fn = NULL; | 131 | char *fn = NULL; |
132 | 132 | ||
133 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { | 133 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { |
134 | GNUNET_GETOPT_OPTION_LOGFILE (&fn), | 134 | GNUNET_GETOPT_option_logfile (&fn), |
135 | GNUNET_GETOPT_OPTION_LOGLEVEL (&level), | 135 | GNUNET_GETOPT_option_loglevel (&level), |
136 | GNUNET_GETOPT_OPTION_END | 136 | GNUNET_GETOPT_OPTION_END |
137 | }; | 137 | }; |
138 | 138 | ||
139 | if (5 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 5, myargv)) | 139 | if (5 != GNUNET_GETOPT_run ("test_getopt", |
140 | logoptionlist, | ||
141 | 5, myargv)) | ||
140 | { | 142 | { |
141 | GNUNET_break (0); | 143 | GNUNET_break (0); |
142 | return 1; | 144 | return 1; |
143 | } | 145 | } |
144 | GNUNET_assert (fn != NULL); | 146 | GNUNET_assert (NULL != fn); |
145 | if ((0 != strcmp (level, "WARNING")) || (0 != strcmp (fn, "filename"))) | 147 | if ( (0 != strcmp (level, "WARNING")) || |
148 | (NULL == strstr (fn, "/filename")) ) | ||
146 | { | 149 | { |
147 | GNUNET_break (0); | 150 | GNUNET_break (0); |
148 | GNUNET_free (level); | 151 | GNUNET_free (level); |
@@ -170,21 +173,35 @@ testFlagNum () | |||
170 | unsigned long long lnum = 0; | 173 | unsigned long long lnum = 0; |
171 | 174 | ||
172 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { | 175 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { |
173 | {'f', "--flag", NULL, "helptext", 0, &GNUNET_GETOPT_set_one, | 176 | GNUNET_GETOPT_option_flag ('f', |
174 | (void *) &flag}, | 177 | "--flag", |
175 | {'n', "--num", "ARG", "helptext", 1, &GNUNET_GETOPT_set_uint, | 178 | "helptext", |
176 | (void *) &num}, | 179 | &flag), |
177 | {'N', "--lnum", "ARG", "helptext", 1, &GNUNET_GETOPT_set_ulong, | 180 | GNUNET_GETOPT_option_uint ('n', |
178 | (void *) &lnum}, | 181 | "--num", |
182 | "ARG", | ||
183 | "helptext", | ||
184 | &num), | ||
185 | GNUNET_GETOPT_option_ulong ('N', | ||
186 | "--lnum", | ||
187 | "ARG", | ||
188 | "helptext", | ||
189 | &lnum), | ||
179 | GNUNET_GETOPT_OPTION_END | 190 | GNUNET_GETOPT_OPTION_END |
180 | }; | 191 | }; |
181 | 192 | ||
182 | if (6 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 6, myargv)) | 193 | if (6 != |
194 | GNUNET_GETOPT_run ("test_getopt", | ||
195 | logoptionlist, | ||
196 | 6, | ||
197 | myargv)) | ||
183 | { | 198 | { |
184 | GNUNET_break (0); | 199 | GNUNET_break (0); |
185 | return 1; | 200 | return 1; |
186 | } | 201 | } |
187 | if ((1 != flag) || (42 != num) || (42 != lnum)) | 202 | if ( (1 != flag) || |
203 | (42 != num) || | ||
204 | (42 != lnum)) | ||
188 | { | 205 | { |
189 | GNUNET_break (0); | 206 | GNUNET_break (0); |
190 | return 1; | 207 | return 1; |
@@ -198,7 +215,9 @@ main (int argc, char *argv[]) | |||
198 | { | 215 | { |
199 | int errCnt = 0; | 216 | int errCnt = 0; |
200 | 217 | ||
201 | GNUNET_log_setup ("test_getopt", "WARNING", NULL); | 218 | GNUNET_log_setup ("test_getopt", |
219 | "WARNING", | ||
220 | NULL); | ||
202 | /* suppress output from -h, -v options */ | 221 | /* suppress output from -h, -v options */ |
203 | #ifndef MINGW | 222 | #ifndef MINGW |
204 | GNUNET_break (0 == CLOSE (1)); | 223 | GNUNET_break (0 == CLOSE (1)); |