Skip to content

Commit 7b4491a

Browse files
wkliaowkliao
committed
fix printing the API names in error messages
1 parent b540c51 commit 7b4491a

File tree

1 file changed

+60
-58
lines changed

1 file changed

+60
-58
lines changed

‎test/testcases/null_args.m4‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ define(`TEST_NULL_ARGS',dnl
5353

5454
#define EXP_ERR_MSG(exp,msg) { \
5555
if (err != exp) { \
56-
nerrs++; \
5756
fprintf(stderr, "Error at %s:%d: (%s) expect %s but got %s\n", \
5857
__FILE__,__LINE__, msg, \
5958
ncmpi_strerrno(exp), ncmpi_strerrno(err)); \
59+
nerrs++; \
60+
goto err_out; \
6061
} \
6162
}
6263

@@ -66,185 +67,185 @@ define(`TEST_NULL_ARGS',`
6667

6768
/*---- test put_var1 ---- */
6869
err = ncmpi_put_var1_$1_all(ncid, vid_$1, start, $1_buf);
69-
EXP_ERR_MSG(NC_NOERR, "put_var1")
70+
EXP_ERR_MSG(NC_NOERR, "put_var1_$1_all")
7071

7172
err = ncmpi_put_var1_$1_all(ncid, vid_$1, NULL, $1_buf);
72-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_var1 start=NULL")
73+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_var1_$1_all start=NULL")
7374

7475
/*---- test put_vara ---- */
7576
err = ncmpi_put_vara_$1_all(ncid, vid_$1, start, count, $1_buf);
76-
EXP_ERR_MSG(NC_NOERR, "put_vara")
77+
EXP_ERR_MSG(NC_NOERR, "put_vara_$1_all")
7778

7879
err = ncmpi_put_vara_$1_all(ncid, vid_$1, NULL, count, $1_buf);
79-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vara start=NULL")
80+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vara_$1_all start=NULL")
8081

8182
err = ncmpi_put_vara_$1_all(ncid, vid_$1, start, NULL, $1_buf);
82-
EXP_ERR_MSG(NC_EEDGE, "put_vara count=NULL")
83+
EXP_ERR_MSG(NC_EEDGE, "put_vara_$1_all count=NULL")
8384

8485
err = ncmpi_put_vara_$1_all(ncid, vid_$1, NULL, NULL, $1_buf);
85-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vara start=count=NULL")
86+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vara_$1_all start=count=NULL")
8687

8788
/*---- test put_vars ---- */
8889
err = ncmpi_put_vars_$1_all(ncid, vid_$1, start, count, stride, $1_buf);
89-
EXP_ERR_MSG(NC_NOERR, "put_vars")
90+
EXP_ERR_MSG(NC_NOERR, "put_vars_$1_all")
9091

9192
err = ncmpi_put_vars_$1_all(ncid, vid_$1, NULL, count, stride, $1_buf);
92-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars start=NULL")
93+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars_$1_all start=NULL")
9394

9495
err = ncmpi_put_vars_$1_all(ncid, vid_$1, start, NULL, stride, $1_buf);
95-
EXP_ERR_MSG(NC_EEDGE, "put_vars count=NULL")
96+
EXP_ERR_MSG(NC_EEDGE, "put_vars_$1_all count=NULL")
9697

9798
err = ncmpi_put_vars_$1_all(ncid, vid_$1, start, count, NULL, $1_buf);
98-
EXP_ERR_MSG(NC_NOERR, "put_vars stride=NULL")
99+
EXP_ERR_MSG(NC_NOERR, "put_vars_$1_all stride=NULL")
99100

100101
err = ncmpi_put_vars_$1_all(ncid, vid_$1, NULL, NULL, stride, $1_buf);
101-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars start=count=NULL")
102+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars_$1_all start=count=NULL")
102103

103104
err = ncmpi_put_vars_$1_all(ncid, vid_$1, NULL, count, NULL, $1_buf);
104-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars start=stride=NULL")
105+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars_$1_all start=stride=NULL")
105106

106107
err = ncmpi_put_vars_$1_all(ncid, vid_$1, start, NULL, NULL, $1_buf);
107-
EXP_ERR_MSG(NC_EEDGE, "put_vars count=stride=NULL")
108+
EXP_ERR_MSG(NC_EEDGE, "put_vars_$1_all count=stride=NULL")
108109

109110
err = ncmpi_put_vars_$1_all(ncid, vid_$1, NULL, NULL, NULL, $1_buf);
110111
EXP_ERR_MSG(NC_EINVALCOORDS, "put_vars start=count=stride=NULL")
111112

112113
/*---- test put_varm ---- */
113114
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, count, stride, imap, $1_buf);
114-
EXP_ERR_MSG(NC_NOERR, "put_varm")
115+
EXP_ERR_MSG(NC_NOERR, "put_varm_$1_all")
115116

116117
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, count, stride, imap, $1_buf);
117-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=NULL")
118+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=NULL")
118119

119120
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, NULL, stride, imap, $1_buf);
120-
EXP_ERR_MSG(NC_EEDGE, "put_varm count=NULL")
121+
EXP_ERR_MSG(NC_EEDGE, "put_varm_$1_all count=NULL")
121122

122123
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, count, NULL, imap, $1_buf);
123-
EXP_ERR_MSG(NC_NOERR, "put_varm stride=NULL")
124+
EXP_ERR_MSG(NC_NOERR, "put_varm_$1_all stride=NULL")
124125

125126
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, count, stride, NULL, $1_buf);
126-
EXP_ERR_MSG(NC_NOERR, "put_varm imap=NULL")
127+
EXP_ERR_MSG(NC_NOERR, "put_varm_$1_all imap=NULL")
127128

128129
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, NULL, stride, imap, $1_buf);
129-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=count=NULL")
130+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=count=NULL")
130131

131132
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, count, NULL, imap, $1_buf);
132-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=stride=NULL")
133+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=stride=NULL")
133134

134135
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, count, stride, NULL, $1_buf);
135-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=imap=NULL")
136+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=imap=NULL")
136137

137138
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, NULL, NULL, imap, $1_buf);
138-
EXP_ERR_MSG(NC_EEDGE, "put_varm count=stride=NULL")
139+
EXP_ERR_MSG(NC_EEDGE, "put_varm_$1_all count=stride=NULL")
139140

140141
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, NULL, stride, NULL, $1_buf);
141-
EXP_ERR_MSG(NC_EEDGE, "put_varm count=imap=NULL")
142+
EXP_ERR_MSG(NC_EEDGE, "put_varm_$1_all count=imap=NULL")
142143

143144
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, count, NULL, NULL, $1_buf);
144-
EXP_ERR_MSG(NC_NOERR, "put_varm stride=imap=NULL")
145+
EXP_ERR_MSG(NC_NOERR, "put_varm_$1_all stride=imap=NULL")
145146

146147
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, NULL, NULL, imap, $1_buf);
147-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=count=stride=NULL")
148+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=count=stride=NULL")
148149

149150
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, NULL, stride, NULL, $1_buf);
150-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=count=imap=NULL")
151+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=count=imap=NULL")
151152

152153
err = ncmpi_put_varm_$1_all(ncid, vid_$1, start, NULL, NULL, NULL, $1_buf);
153-
EXP_ERR_MSG(NC_EEDGE, "put_varm count=stride=imap=NULL")
154+
EXP_ERR_MSG(NC_EEDGE, "put_varm_$1_all count=stride=imap=NULL")
154155

155156
err = ncmpi_put_varm_$1_all(ncid, vid_$1, NULL, NULL, NULL, NULL, $1_buf);
156-
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm start=count=stride=imap=NULL")
157+
EXP_ERR_MSG(NC_EINVALCOORDS, "put_varm_$1_all start=count=stride=imap=NULL")
157158

158159
/*---- test get_var1 ---- */
159160
err = ncmpi_get_var1_$1_all(ncid, vid_$1, start, $1_buf);
160-
EXP_ERR_MSG(NC_NOERR, "get_var1")
161+
EXP_ERR_MSG(NC_NOERR, "get_var1_$1_all")
161162

162163
err = ncmpi_get_var1_$1_all(ncid, vid_$1, NULL, $1_buf);
163-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_var1 start=NULL")
164+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_var1_$1_all start=NULL")
164165

165166
/*---- test get_vara ---- */
166167
err = ncmpi_get_vara_$1_all(ncid, vid_$1, start, count, $1_buf);
167-
EXP_ERR_MSG(NC_NOERR, "get_vara")
168+
EXP_ERR_MSG(NC_NOERR, "get_vara_$1_all")
168169

169170
err = ncmpi_get_vara_$1_all(ncid, vid_$1, NULL, count, $1_buf);
170-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vara start=NULL")
171+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vara_$1_all start=NULL")
171172

172173
err = ncmpi_get_vara_$1_all(ncid, vid_$1, start, NULL, $1_buf);
173-
EXP_ERR_MSG(NC_EEDGE, "get_vara count=NULL")
174+
EXP_ERR_MSG(NC_EEDGE, "get_vara_$1_all count=NULL")
174175

175176
err = ncmpi_get_vara_$1_all(ncid, vid_$1, NULL, NULL, $1_buf);
176-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vara start=count=NULL")
177+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vara_$1_all start=count=NULL")
177178

178179
/*---- test get_vars ---- */
179180
err = ncmpi_get_vars_$1_all(ncid, vid_$1, start, count, stride, $1_buf);
180-
EXP_ERR_MSG(NC_NOERR, "get_vars")
181+
EXP_ERR_MSG(NC_NOERR, "get_vars_$1_all")
181182

182183
err = ncmpi_get_vars_$1_all(ncid, vid_$1, NULL, count, stride, $1_buf);
183-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars start=NULL")
184+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars_$1_all start=NULL")
184185

185186
err = ncmpi_get_vars_$1_all(ncid, vid_$1, start, NULL, stride, $1_buf);
186-
EXP_ERR_MSG(NC_EEDGE, "get_vars count=NULL")
187+
EXP_ERR_MSG(NC_EEDGE, "get_vars_$1_all count=NULL")
187188

188189
err = ncmpi_get_vars_$1_all(ncid, vid_$1, start, count, NULL, $1_buf);
189-
EXP_ERR_MSG(NC_NOERR, "get_vars stride=NULL")
190+
EXP_ERR_MSG(NC_NOERR, "get_vars_$1_all stride=NULL")
190191

191192
err = ncmpi_get_vars_$1_all(ncid, vid_$1, NULL, NULL, stride, $1_buf);
192-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars start=count=NULL")
193+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars_$1_all start=count=NULL")
193194

194195
err = ncmpi_get_vars_$1_all(ncid, vid_$1, NULL, count, NULL, $1_buf);
195-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars start=stride=NULL")
196+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars_$1_all start=stride=NULL")
196197

197198
err = ncmpi_get_vars_$1_all(ncid, vid_$1, start, NULL, NULL, $1_buf);
198-
EXP_ERR_MSG(NC_EEDGE, "get_vars count=stride=NULL")
199+
EXP_ERR_MSG(NC_EEDGE, "get_vars_$1_all count=stride=NULL")
199200

200201
err = ncmpi_get_vars_$1_all(ncid, vid_$1, NULL, NULL, NULL, $1_buf);
201-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars start=count=stride=NULL")
202+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_vars_$1_all start=count=stride=NULL")
202203

203204
/*---- test get_varm ---- */
204205
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, count, stride, imap, $1_buf);
205-
EXP_ERR_MSG(NC_NOERR, "get_varm")
206+
EXP_ERR_MSG(NC_NOERR, "get_varm_$1_all")
206207

207208
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, count, stride, imap, $1_buf);
208-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=NULL")
209+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=NULL")
209210

210211
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, NULL, stride, imap, $1_buf);
211-
EXP_ERR_MSG(NC_EEDGE, "get_varm count=NULL")
212+
EXP_ERR_MSG(NC_EEDGE, "get_varm_$1_all count=NULL")
212213

213214
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, count, NULL, imap, $1_buf);
214-
EXP_ERR_MSG(NC_NOERR, "get_varm stride=NULL")
215+
EXP_ERR_MSG(NC_NOERR, "get_varm_$1_all stride=NULL")
215216

216217
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, count, stride, NULL, $1_buf);
217-
EXP_ERR_MSG(NC_NOERR, "get_varm imap=NULL")
218+
EXP_ERR_MSG(NC_NOERR, "get_varm_$1_all imap=NULL")
218219

219220
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, NULL, stride, imap, $1_buf);
220-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=count=NULL")
221+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=count=NULL")
221222

222223
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, count, NULL, imap, $1_buf);
223-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=stride=NULL")
224+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=stride=NULL")
224225

225226
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, count, stride, NULL, $1_buf);
226-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=imap=NULL")
227+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=imap=NULL")
227228

228229
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, NULL, NULL, imap, $1_buf);
229-
EXP_ERR_MSG(NC_EEDGE, "get_varm count=stride=NULL")
230+
EXP_ERR_MSG(NC_EEDGE, "get_varm_$1_all count=stride=NULL")
230231

231232
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, NULL, stride, NULL, $1_buf);
232-
EXP_ERR_MSG(NC_EEDGE, "get_varm count=imap=NULL")
233+
EXP_ERR_MSG(NC_EEDGE, "get_varm_$1_all count=imap=NULL")
233234

234235
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, count, NULL, NULL, $1_buf);
235-
EXP_ERR_MSG(NC_NOERR, "get_varm stride=imap=NULL")
236+
EXP_ERR_MSG(NC_NOERR, "get_varm_$1_all stride=imap=NULL")
236237

237238
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, NULL, NULL, imap, $1_buf);
238-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=count=stride=NULL")
239+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=count=stride=NULL")
239240

240241
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, NULL, stride, NULL, $1_buf);
241-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=count=imap=NULL")
242+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=count=imap=NULL")
242243

243244
err = ncmpi_get_varm_$1_all(ncid, vid_$1, start, NULL, NULL, NULL, $1_buf);
244-
EXP_ERR_MSG(NC_EEDGE, "get_varm count=stride=imap=NULL")
245+
EXP_ERR_MSG(NC_EEDGE, "get_varm_$1_all count=stride=imap=NULL")
245246

246247
err = ncmpi_get_varm_$1_all(ncid, vid_$1, NULL, NULL, NULL, NULL, $1_buf);
247-
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm start=count=stride=imap=NULL")
248+
EXP_ERR_MSG(NC_EINVALCOORDS, "get_varm_$1_all start=count=stride=imap=NULL")
248249
')dnl
249250

250251
define(`CDF5_ITYPES',`schar,uchar,short,ushort,int,uint,long,float,double,longlong,ulonglong')dnl
@@ -306,6 +307,7 @@ test_format_nc$1(char *filename)
306307

307308
foreach(`itype',(text, TYPE_LIST),`TEST_NULL_ARGS(itype)')
308309

310+
err_out:
309311
err = ncmpi_close(ncid);
310312
EXP_ERR_MSG(NC_NOERR, "close")
311313

0 commit comments

Comments
 (0)