Mercurial > hg > octave-lyh
annotate scripts/testfun/test.m @ 14363:f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
* wavread.m, acosd.m, acot.m, acotd.m, acoth.m, acsc.m, acscd.m, acsch.m,
asec.m, asecd.m, asech.m, asind.m, atand.m, cosd.m, cot.m, cotd.m, coth.m,
csc.m, cscd.m, csch.m, sec.m, secd.m, sech.m, sind.m, tand.m, accumarray.m,
accumdim.m, bitcmp.m, bitget.m, bitset.m, blkdiag.m, cart2pol.m, cart2sph.m,
celldisp.m, chop.m, circshift.m, colon.m, common_size.m, cplxpair.m,
cumtrapz.m, curl.m, dblquad.m, deal.m, divergence.m, flipdim.m, fliplr.m,
flipud.m, genvarname.m, gradient.m, idivide.m, int2str.m, interp1.m,
interp1q.m, interp2.m, interp3.m, interpft.m, interpn.m, isa.m, isdir.m,
isequal.m, isequalwithequalnans.m, issquare.m, logspace.m, nargchk.m,
narginchk.m, nargoutchk.m, nextpow2.m, nthargout.m, num2str.m, pol2cart.m,
polyarea.m, postpad.m, prepad.m, profile.m, profshow.m, quadgk.m, quadv.m,
randi.m, rat.m, repmat.m, rot90.m, rotdim.m, shift.m, shiftdim.m, sph2cart.m,
structfun.m, trapz.m, triplequad.m, convhull.m, dsearch.m, dsearchn.m,
griddata3.m, griddatan.m, rectint.m, tsearchn.m, __makeinfo__.m, doc.m,
get_first_help_sentence.m, help.m, type.m, unimplemented.m, which.m, imread.m,
imwrite.m, dlmwrite.m, fileread.m, is_valid_file_id.m, strread.m, textread.m,
textscan.m, commutation_matrix.m, cond.m, condest.m, cross.m,
duplication_matrix.m, expm.m, housh.m, isdefinite.m, ishermitian.m,
issymmetric.m, logm.m, normest.m, null.m, onenormest.m, orth.m, planerot.m,
qzhess.m, rank.m, rref.m, trace.m, vech.m, ans.m, bincoeff.m, bug_report.m,
bzip2.m, comma.m, compare_versions.m, computer.m, edit.m, fileparts.m,
fullfile.m, getfield.m, gzip.m, info.m, inputname.m, isappdata.m, isdeployed.m,
ismac.m, ispc.m, isunix.m, list_primes.m, ls.m, mexext.m, namelengthmax.m,
news.m, orderfields.m, paren.m, recycle.m, rmappdata.m, semicolon.m,
setappdata.m, setfield.m, substruct.m, symvar.m, ver.m, version.m,
warning_ids.m, xor.m, fminbnd.m, fsolve.m, fzero.m, lsqnonneg.m, optimset.m,
pqpnonneg.m, sqp.m, matlabroot.m, __gnuplot_drawnow__.m,
__plt_get_axis_arg__.m, ancestor.m, cla.m, clf.m, close.m, colorbar.m,
colstyle.m, comet3.m, contourc.m, figure.m, gca.m, gcbf.m, gcbo.m, gcf.m,
ginput.m, graphics_toolkit.m, gtext.m, hggroup.m, hist.m, hold.m, isfigure.m,
ishghandle.m, ishold.m, isocolors.m, isonormals.m, isosurface.m, isprop.m,
legend.m, line.m, loglog.m, loglogerr.m, meshgrid.m, ndgrid.m, newplot.m,
orient.m, patch.m, plot3.m, plotyy.m, __print_parse_opts__.m, quiver3.m,
refreshdata.m, ribbon.m, semilogx.m, semilogxerr.m, semilogy.m, stem.m,
stem3.m, subplot.m, title.m, uigetfile.m, view.m, whitebg.m, compan.m, conv.m,
deconv.m, mkpp.m, mpoles.m, pchip.m, poly.m, polyaffine.m, polyder.m,
polyfit.m, polygcd.m, polyint.m, polyout.m, polyval.m, polyvalm.m, ppder.m,
ppint.m, ppjumps.m, ppval.m, residue.m, roots.m, spline.m, intersect.m,
ismember.m, powerset.m, setdiff.m, setxor.m, union.m, unique.m,
autoreg_matrix.m, bartlett.m, blackman.m, detrend.m, fftconv.m, fftfilt.m,
fftshift.m, freqz.m, hamming.m, hanning.m, ifftshift.m, sinc.m, sinetone.m,
sinewave.m, unwrap.m, bicg.m, bicgstab.m, gmres.m, gplot.m, nonzeros.m, pcg.m,
pcr.m, spaugment.m, spconvert.m, spdiags.m, speye.m, spfun.m, spones.m,
sprand.m, sprandsym.m, spstats.m, spy.m, svds.m, treelayout.m, bessel.m,
beta.m, betaln.m, factor.m, factorial.m, isprime.m, lcm.m, legendre.m,
nchoosek.m, nthroot.m, perms.m, pow2.m, primes.m, reallog.m, realpow.m,
realsqrt.m, hadamard.m, hankel.m, hilb.m, invhilb.m, magic.m, rosser.m,
vander.m, __finish__.m, center.m, cloglog.m, corr.m, cov.m, gls.m, histc.m,
iqr.m, kendall.m, kurtosis.m, logit.m, mahalanobis.m, mean.m, meansq.m,
median.m, mode.m, moment.m, ols.m, ppplot.m, prctile.m, probit.m, quantile.m,
range.m, ranks.m, run_count.m, runlength.m, skewness.m, spearman.m,
statistics.m, std.m, table.m, var.m, zscore.m, betacdf.m, betainv.m, betapdf.m,
betarnd.m, binocdf.m, binoinv.m, binopdf.m, binornd.m, cauchy_cdf.m,
cauchy_inv.m, cauchy_pdf.m, cauchy_rnd.m, chi2cdf.m, chi2inv.m, chi2pdf.m,
chi2rnd.m, discrete_cdf.m, discrete_inv.m, discrete_pdf.m, discrete_rnd.m,
empirical_cdf.m, empirical_inv.m, empirical_pdf.m, empirical_rnd.m, expcdf.m,
expinv.m, exppdf.m, exprnd.m, fcdf.m, finv.m, fpdf.m, frnd.m, gamcdf.m,
gaminv.m, gampdf.m, gamrnd.m, geocdf.m, geoinv.m, geopdf.m, geornd.m,
hygecdf.m, hygeinv.m, hygepdf.m, hygernd.m, kolmogorov_smirnov_cdf.m,
laplace_cdf.m, laplace_inv.m, laplace_pdf.m, laplace_rnd.m, logistic_cdf.m,
logistic_inv.m, logistic_pdf.m, logistic_rnd.m, logncdf.m, logninv.m,
lognpdf.m, lognrnd.m, nbincdf.m, nbininv.m, nbinpdf.m, nbinrnd.m, normcdf.m,
norminv.m, normpdf.m, normrnd.m, poisscdf.m, poissinv.m, poisspdf.m,
poissrnd.m, stdnormal_cdf.m, stdnormal_inv.m, stdnormal_pdf.m, stdnormal_rnd.m,
tcdf.m, tinv.m, tpdf.m, trnd.m, unidcdf.m, unidinv.m, unidpdf.m, unidrnd.m,
unifcdf.m, unifinv.m, unifpdf.m, unifrnd.m, wblcdf.m, wblinv.m, wblpdf.m,
wblrnd.m, kolmogorov_smirnov_test.m, kruskal_wallis_test.m, base2dec.m,
bin2dec.m, blanks.m, cstrcat.m, deblank.m, dec2base.m, dec2bin.m, dec2hex.m,
findstr.m, hex2dec.m, index.m, isletter.m, mat2str.m, rindex.m, str2num.m,
strcat.m, strjust.m, strmatch.m, strsplit.m, strtok.m, strtrim.m, strtrunc.m,
substr.m, validatestring.m, demo.m, example.m, fail.m, speed.m, addtodate.m,
asctime.m, clock.m, ctime.m, date.m, datenum.m, datetick.m, datevec.m,
eomday.m, etime.m, is_leap_year.m, now.m:
Use Octave coding conventions in all m-file %!test blocks
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Mon, 13 Feb 2012 07:29:44 -0800 |
| parents | 7277fe922e99 |
| children | 460a3c6d8bf1 |
| rev | line source |
|---|---|
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14066
diff
changeset
|
1 ## Copyright (C) 2005-2012 Paul Kienzle |
| 5589 | 2 ## |
| 7016 | 3 ## This file is part of Octave. |
| 5589 | 4 ## |
| 7016 | 5 ## Octave is free software; you can redistribute it and/or modify it |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 5589 | 14 ## |
| 15 ## You should have received a copy of the GNU General Public License | |
| 7016 | 16 ## along with Octave; see the file COPYING. If not, see |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 5589 | 18 |
| 19 ## -*- texinfo -*- | |
|
11412
a8a9f062d0ef
test.m: Use 'Command' for deftype in docstring.
Rik <octave@nomad.inbox5.com>
parents:
11032
diff
changeset
|
20 ## @deftypefn {Command} {} test @var{name} |
|
a8a9f062d0ef
test.m: Use 'Command' for deftype in docstring.
Rik <octave@nomad.inbox5.com>
parents:
11032
diff
changeset
|
21 ## @deftypefnx {Command} {} test @var{name} quiet|normal|verbose |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
22 ## @deftypefnx {Function File} {} test ("@var{name}", "quiet|normal|verbose", @var{fid}) |
|
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
23 ## @deftypefnx {Function File} {} test ([], "explain", @var{fid}) |
| 5589 | 24 ## @deftypefnx {Function File} {@var{success} =} test (@dots{}) |
| 25 ## @deftypefnx {Function File} {[@var{n}, @var{max}] =} test (@dots{}) | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
26 ## @deftypefnx {Function File} {[@var{code}, @var{idx}] =} test ("@var{name}", "grabdemo") |
| 5589 | 27 ## |
| 28 ## Perform tests from the first file in the loadpath matching @var{name}. | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
29 ## @code{test} can be called as a command or as a function. Called with |
| 5589 | 30 ## a single argument @var{name}, the tests are run interactively and stop |
| 31 ## after the first error is encountered. | |
| 32 ## | |
| 33 ## With a second argument the tests which are performed and the amount of | |
| 34 ## output is selected. | |
| 35 ## | |
| 36 ## @table @asis | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
37 ## @item "quiet" |
| 5589 | 38 ## Don't report all the tests as they happen, just the errors. |
| 39 ## | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
40 ## @item "normal" |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
41 ## Report all tests as they happen, but don't do tests which require |
| 5589 | 42 ## user interaction. |
| 43 ## | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
44 ## @item "verbose" |
| 5589 | 45 ## Do tests which require user interaction. |
| 46 ## @end table | |
| 47 ## | |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
48 ## The argument @var{fid} can be used to allow batch processing. Errors |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
49 ## can be written to the already open file defined by @var{fid}, and |
|
8481
00df69d7e698
[docs] capitalize Octave consistently
Brian Gough <bjg@gnu.org>
parents:
8422
diff
changeset
|
50 ## hopefully when Octave crashes this file will tell you what was happening |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
51 ## when it did. You can use @code{stdout} if you want to see the results as |
| 5589 | 52 ## they happen. You can also give a file name rather than an @var{fid}, in |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
53 ## which case the contents of the file will be replaced with the log from |
| 5589 | 54 ## the current test. |
| 55 ## | |
| 56 ## Called with a single output argument @var{success}, @code{test} returns | |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
57 ## true if all of the tests were successful. Called with two output arguments |
| 7001 | 58 ## @var{n} and @var{max}, the number of successful tests and the total number |
| 5589 | 59 ## of tests in the file @var{name} are returned. |
| 60 ## | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
61 ## If the second argument is the string "grabdemo", the contents of the demo |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
62 ## blocks are extracted but not executed. Code for all code blocks is |
| 7001 | 63 ## concatenated and returned as @var{code} with @var{idx} being a vector of |
| 5589 | 64 ## positions of the ends of the demo blocks. |
| 65 ## | |
|
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
66 ## If the second argument is "explain", then @var{name} is ignored and an |
| 5589 | 67 ## explanation of the line markers used is written to the file @var{fid}. |
|
11412
a8a9f062d0ef
test.m: Use 'Command' for deftype in docstring.
Rik <octave@nomad.inbox5.com>
parents:
11032
diff
changeset
|
68 ## @seealso{assert, fail, error, demo, example} |
| 5589 | 69 ## @end deftypefn |
| 70 | |
|
8202
cf59d542f33e
replace all TODOs and XXXs with FIXMEs
Jaroslav Hajek <highegg@gmail.com>
parents:
7940
diff
changeset
|
71 ## FIXME: * Consider using keyword fail rather then error? This allows us |
|
cf59d542f33e
replace all TODOs and XXXs with FIXMEs
Jaroslav Hajek <highegg@gmail.com>
parents:
7940
diff
changeset
|
72 ## to make a functional form of error blocks, which means we |
|
cf59d542f33e
replace all TODOs and XXXs with FIXMEs
Jaroslav Hajek <highegg@gmail.com>
parents:
7940
diff
changeset
|
73 ## can include them in test sections which means that we can use |
|
cf59d542f33e
replace all TODOs and XXXs with FIXMEs
Jaroslav Hajek <highegg@gmail.com>
parents:
7940
diff
changeset
|
74 ## octave flow control for both kinds of tests. |
| 5589 | 75 |
| 7242 | 76 function [__ret1, __ret2, __ret3, __ret4] = test (__name, __flag, __fid) |
| 8506 | 77 ## Information from test will be introduced by "key". |
| 5589 | 78 persistent __signal_fail = "!!!!! "; |
| 79 persistent __signal_empty = "????? "; | |
| 80 persistent __signal_block = " ***** "; | |
| 81 persistent __signal_file = ">>>>> "; | |
| 7242 | 82 persistent __signal_skip = "----- "; |
| 5589 | 83 |
| 6730 | 84 __xfail = 0; |
| 7242 | 85 __xskip = 0; |
| 6730 | 86 |
| 6494 | 87 if (nargin < 2 || isempty (__flag)) |
| 5589 | 88 __flag = "quiet"; |
| 89 endif | |
| 6494 | 90 if (nargin < 3) |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
91 __fid = []; |
| 5589 | 92 endif |
| 6494 | 93 if (nargin < 1 || nargin > 3 |
| 94 || (! ischar (__name) && ! isempty (__name)) || ! ischar (__flag)) | |
| 6046 | 95 print_usage (); |
| 5589 | 96 endif |
| 6494 | 97 if (isempty (__name) && (nargin != 3 || ! strcmp (__flag, "explain"))) |
| 6046 | 98 print_usage (); |
| 5589 | 99 endif |
| 6494 | 100 __batch = (! isempty (__fid)); |
| 5589 | 101 |
| 8506 | 102 ## Decide if error messages should be collected. |
| 5589 | 103 __close_fid = 0; |
| 104 if (__batch) | |
| 6494 | 105 if (ischar (__fid)) |
| 106 __fid = fopen (__fid, "wt"); | |
| 107 if (__fid < 0) | |
|
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10615
diff
changeset
|
108 error ("test: could not open log file"); |
| 6494 | 109 endif |
| 5589 | 110 __close_fid = 1; |
| 111 endif | |
| 112 fprintf (__fid, "%sprocessing %s\n", __signal_file, __name); | |
| 5908 | 113 fflush (__fid); |
| 5589 | 114 else |
| 115 __fid = stdout; | |
| 116 endif | |
| 117 | |
| 6494 | 118 if (strcmp (__flag, "normal")) |
| 5589 | 119 __grabdemo = 0; |
| 120 __rundemo = 0; | |
| 121 __verbose = __batch; | |
| 6494 | 122 elseif (strcmp (__flag, "quiet")) |
| 5589 | 123 __grabdemo = 0; |
| 124 __rundemo = 0; | |
| 125 __verbose = 0; | |
| 6494 | 126 elseif (strcmp (__flag, "verbose")) |
| 5589 | 127 __grabdemo = 0; |
| 128 __rundemo = 1; | |
| 129 __verbose = 1; | |
| 6494 | 130 elseif (strcmp (__flag, "grabdemo")) |
| 5589 | 131 __grabdemo = 1; |
| 132 __rundemo = 0; | |
| 133 __verbose = 0; | |
| 134 __demo_code = ""; | |
|
12643
55430618bd5f
Properly warn when demo or example called on a function without demos
Rik <octave@nomad.inbox5.com>
parents:
12447
diff
changeset
|
135 __demo_idx = []; |
| 6494 | 136 elseif (strcmp (__flag, "explain")) |
| 137 fprintf (__fid, "# %s new test file\n", __signal_file); | |
| 138 fprintf (__fid, "# %s no tests in file\n", __signal_empty); | |
| 139 fprintf (__fid, "# %s test had an unexpected result\n", __signal_fail); | |
| 140 fprintf (__fid, "# %s code for the test\n", __signal_block); | |
| 5589 | 141 fprintf (__fid, "# Search for the unexpected results in the file\n"); |
| 142 fprintf (__fid, "# then page back to find the file name which caused it.\n"); | |
| 143 fprintf (__fid, "# The result may be an unexpected failure (in which\n"); | |
| 144 fprintf (__fid, "# case an error will be reported) or an unexpected\n"); | |
| 145 fprintf (__fid, "# success (in which case no error will be reported).\n"); | |
| 5908 | 146 fflush (__fid); |
| 6494 | 147 if (__close_fid) |
| 148 fclose(__fid); | |
| 149 endif | |
| 5589 | 150 return; |
| 151 else | |
|
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10615
diff
changeset
|
152 error ("test: unknown flag '%s'", __flag); |
| 5589 | 153 endif |
| 154 | |
| 8506 | 155 ## Locate the file to test. |
| 6249 | 156 __file = file_in_loadpath (__name, "all"); |
| 157 if (isempty (__file)) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7244
diff
changeset
|
158 __file = file_in_loadpath (cstrcat (__name, ".m"), "all"); |
| 5589 | 159 endif |
| 160 if (isempty (__file)) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7244
diff
changeset
|
161 __file = file_in_loadpath (cstrcat (__name, ".cc"), "all"); |
| 6249 | 162 endif |
| 163 if (iscell (__file)) | |
| 6365 | 164 ## If repeats, return first in path. |
| 165 if (isempty (__file)) | |
| 166 __file = ""; | |
| 167 else | |
| 168 __file = __file{1}; | |
| 169 endif | |
| 5589 | 170 endif |
| 171 if (isempty (__file)) | |
| 172 if (__grabdemo) | |
| 173 __ret1 = ""; | |
| 174 __ret2 = []; | |
| 175 else | |
|
12447
890e89c3dfeb
More explicit error message when source with tests for dynamically linked functions not found (#30341)
David Bateman <dbateman@free.fr>
parents:
11587
diff
changeset
|
176 if (exist (__name) == 3) |
|
890e89c3dfeb
More explicit error message when source with tests for dynamically linked functions not found (#30341)
David Bateman <dbateman@free.fr>
parents:
11587
diff
changeset
|
177 fprintf (__fid, "%s%s source code with tests for dynamically linked function not found\n", __signal_empty, __name); |
|
890e89c3dfeb
More explicit error message when source with tests for dynamically linked functions not found (#30341)
David Bateman <dbateman@free.fr>
parents:
11587
diff
changeset
|
178 else |
|
890e89c3dfeb
More explicit error message when source with tests for dynamically linked functions not found (#30341)
David Bateman <dbateman@free.fr>
parents:
11587
diff
changeset
|
179 fprintf (__fid, "%s%s does not exist in path\n", __signal_empty, __name); |
|
890e89c3dfeb
More explicit error message when source with tests for dynamically linked functions not found (#30341)
David Bateman <dbateman@free.fr>
parents:
11587
diff
changeset
|
180 endif |
| 5908 | 181 fflush (__fid); |
| 6494 | 182 if (nargout > 0) |
| 10549 | 183 __ret1 = __ret2 = 0; |
| 6494 | 184 endif |
| 5589 | 185 endif |
| 6494 | 186 if (__close_fid) |
| 187 fclose(__fid); | |
| 188 endif | |
| 5589 | 189 return; |
| 190 endif | |
| 191 | |
| 8506 | 192 ## Grab the test code from the file. |
| 5589 | 193 __body = __extract_test_code (__file); |
| 194 | |
| 195 if (isempty (__body)) | |
| 196 if (__grabdemo) | |
| 197 __ret1 = ""; | |
| 198 __ret2 = []; | |
| 199 else | |
| 6494 | 200 fprintf (__fid, "%s%s has no tests available\n", __signal_empty, __file); |
| 5908 | 201 fflush (__fid); |
| 6494 | 202 if (nargout > 0) |
| 10549 | 203 __ret1 = __ret2 = 0; |
| 6494 | 204 endif |
| 5589 | 205 endif |
| 6494 | 206 if (__close_fid) |
| 207 fclose(__fid); | |
| 208 endif | |
| 5589 | 209 return; |
| 210 else | |
| 8506 | 211 ## Add a dummy comment block to the end for ease of indexing. |
| 5589 | 212 if (__body (length(__body)) == "\n") |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
213 __body = sprintf ("\n%s#", __body); |
| 5589 | 214 else |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
215 __body = sprintf ("\n%s\n#", __body); |
| 5589 | 216 endif |
| 217 endif | |
| 218 | |
| 8506 | 219 ## Chop it up into blocks for evaluation. |
| 6494 | 220 __lineidx = find (__body == "\n"); |
| 221 __blockidx = __lineidx(find (! isspace (__body(__lineidx+1))))+1; | |
| 5589 | 222 |
| 8506 | 223 ## Ready to start tests ... if in batch mode, tell us what is happening. |
| 5589 | 224 if (__verbose) |
| 8507 | 225 disp (cstrcat (__signal_file, __file)); |
| 5589 | 226 endif |
| 227 | |
| 8506 | 228 ## Assume all tests will pass. |
| 5589 | 229 __all_success = 1; |
| 230 | |
| 8506 | 231 ## Process each block separately, initially with no shared variables. |
| 5589 | 232 __tests = __successes = 0; |
| 233 __shared = " "; | |
| 234 __shared_r = " "; | |
| 235 __clear = ""; | |
| 6494 | 236 for __i = 1:length(__blockidx)-1 |
| 5589 | 237 |
| 8506 | 238 ## Extract the block. |
| 5589 | 239 __block = __body(__blockidx(__i):__blockidx(__i+1)-2); |
| 240 | |
| 8506 | 241 ## Let the user/logfile know what is happening. |
| 5589 | 242 if (__verbose) |
| 243 fprintf (__fid, "%s%s\n", __signal_block, __block); | |
| 5908 | 244 fflush (__fid); |
| 5589 | 245 endif |
| 246 | |
| 8506 | 247 ## Split __block into __type and __code. |
| 6494 | 248 __idx = find (! isletter (__block)); |
| 249 if (isempty (__idx)) | |
| 5589 | 250 __type = __block; |
| 251 __code = ""; | |
| 252 else | |
| 253 __type = __block(1:__idx(1)-1); | |
| 254 __code = __block(__idx(1):length(__block)); | |
| 255 endif | |
| 256 | |
| 8506 | 257 ## Assume the block will succeed. |
| 5589 | 258 __success = 1; |
| 259 __msg = []; | |
| 260 | |
| 8506 | 261 ### DEMO |
| 262 | |
| 5589 | 263 ## If in __grabdemo mode, then don't process any other block type. |
| 264 ## So that the other block types don't have to worry about | |
| 265 ## this __grabdemo mode, the demo block processor grabs all block | |
| 266 ## types and skips those which aren't demo blocks. | |
| 8506 | 267 |
| 5589 | 268 __isdemo = strcmp (__type, "demo"); |
| 269 if (__grabdemo || __isdemo) | |
| 270 __istest = 0; | |
| 271 | |
| 272 if (__grabdemo && __isdemo) | |
| 10549 | 273 if (isempty(__demo_code)) |
| 274 __demo_code = __code; | |
| 275 __demo_idx = [1, length(__demo_code)+1]; | |
| 276 else | |
| 277 __demo_code = cstrcat(__demo_code, __code); | |
| 278 __demo_idx = [__demo_idx, length(__demo_code)+1]; | |
| 279 endif | |
| 5589 | 280 |
| 281 elseif (__rundemo && __isdemo) | |
| 10549 | 282 try |
| 283 ## process the code in an environment without variables | |
| 284 eval (sprintf ("function __test__()\n%s\nendfunction", __code)); | |
| 285 __test__; | |
| 286 input ("Press <enter> to continue: ", "s"); | |
| 287 catch | |
| 288 __success = 0; | |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
289 __msg = sprintf ("%sdemo failed\n%s", __signal_fail, lasterr ()); |
| 10549 | 290 end_try_catch |
| 291 clear __test__; | |
| 5589 | 292 |
| 293 endif | |
| 8506 | 294 ## Code already processed. |
| 295 __code = ""; | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
296 |
| 8506 | 297 ### SHARED |
| 298 | |
| 299 elseif (strcmp (__type, "shared")) | |
| 5589 | 300 __istest = 0; |
| 301 | |
| 8506 | 302 ## Separate initialization code from variables. |
| 6494 | 303 __idx = find (__code == "\n"); |
| 304 if (isempty (__idx)) | |
| 10549 | 305 __vars = __code; |
| 306 __code = ""; | |
| 5589 | 307 else |
| 10549 | 308 __vars = __code (1:__idx(1)-1); |
| 309 __code = __code (__idx(1):length(__code)); | |
| 5589 | 310 endif |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
311 |
| 8506 | 312 ## Strip comments off the variables. |
| 6730 | 313 __idx = find (__vars == "%" | __vars == "#"); |
| 6494 | 314 if (! isempty (__idx)) |
| 10549 | 315 __vars = __vars(1:__idx(1)-1); |
| 5589 | 316 endif |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
317 |
| 8506 | 318 ## Assign default values to variables. |
| 5589 | 319 try |
| 10549 | 320 __vars = deblank (__vars); |
| 321 if (! isempty (__vars)) | |
| 322 eval (cstrcat (strrep (__vars, ",", "=[];"), "=[];")); | |
| 323 __shared = __vars; | |
| 324 __shared_r = cstrcat ("[ ", __vars, "] = "); | |
| 325 else | |
| 326 __shared = " "; | |
| 327 __shared_r = " "; | |
| 328 endif | |
| 5589 | 329 catch |
| 10549 | 330 ## Couldn't declare, so don't initialize. |
| 331 __code = ""; | |
| 332 __success = 0; | |
| 333 __msg = sprintf ("%sshared variable initialization failed\n", | |
| 334 __signal_fail); | |
| 5589 | 335 end_try_catch |
| 336 | |
| 8506 | 337 ## Clear shared function definitions. |
| 6494 | 338 eval (__clear, ""); |
| 339 __clear = ""; | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
340 |
| 8506 | 341 ## Initialization code will be evaluated below. |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
342 |
| 8506 | 343 ### FUNCTION |
| 344 | |
| 6494 | 345 elseif (strcmp (__type, "function")) |
| 5589 | 346 __istest = 0; |
| 347 persistent __fn = 0; | |
| 6494 | 348 __name_position = function_name (__block); |
| 349 if (isempty (__name_position)) | |
| 5589 | 350 __success = 0; |
| 6494 | 351 __msg = sprintf ("%stest failed: missing function name\n", |
| 10549 | 352 __signal_fail); |
| 5589 | 353 else |
| 354 __name = __block(__name_position(1):__name_position(2)); | |
|
10130
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10128
diff
changeset
|
355 __code = __block; |
| 5589 | 356 try |
| 357 eval(__code); ## Define the function | |
| 6494 | 358 __clear = sprintf ("%sclear %s;\n", __clear, __name); |
| 5589 | 359 catch |
| 360 __success = 0; | |
| 6494 | 361 __msg = sprintf ("%stest failed: syntax error\n%s", |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
362 __signal_fail, lasterr ()); |
| 5589 | 363 end_try_catch |
| 364 endif | |
| 365 __code = ""; | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
366 |
|
13305
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
367 ### ENDFUNCTION |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
368 |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
369 elseif (strcmp (__type, "endfunction")) |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
370 ## endfunction simply declares the end of a previous function block. |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
371 ## There is no processing to be done here, just skip to next block. |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
372 __istest = 0; |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
373 __code = ""; |
|
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
374 |
| 8506 | 375 ### ASSERT/FAIL |
| 5589 | 376 |
| 6494 | 377 elseif (strcmp (__type, "assert") || strcmp (__type, "fail")) |
| 5589 | 378 __istest = 1; |
| 8506 | 379 ## Put the keyword back on the code. |
| 380 __code = __block; | |
| 381 ## The code will be evaluated below as a test block. | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
382 |
| 8506 | 383 ### ERROR/WARNING |
| 384 | |
| 6494 | 385 elseif (strcmp (__type, "error") || strcmp(__type, "warning")) |
| 5589 | 386 __istest = 1; |
| 6494 | 387 __warning = strcmp (__type, "warning"); |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
388 [__pattern, __id, __code] = getpattern (__code); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
389 if (__id) |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
390 __patstr = ["id=",__id]; |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
391 else |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
392 __patstr = ["<",__pattern,">"]; |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
393 endif |
| 5589 | 394 try |
| 10549 | 395 eval (sprintf ("function __test__(%s)\n%s\nendfunction", |
| 396 __shared, __code)); | |
| 5589 | 397 catch |
| 10549 | 398 __success = 0; |
| 399 __msg = sprintf ("%stest failed: syntax error\n%s", | |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
400 __signal_fail, lasterr ()); |
| 5589 | 401 end_try_catch |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
402 |
| 5589 | 403 if (__success) |
| 404 __success = 0; | |
| 10549 | 405 __warnstate = warning ("query", "quiet"); |
| 406 warning ("on", "quiet"); | |
| 407 try | |
| 408 eval (sprintf ("__test__(%s);", __shared)); | |
| 6494 | 409 if (! __warning) |
| 10549 | 410 __msg = sprintf ("%sexpected %s but got no error\n", |
| 411 __signal_fail, __patstr); | |
| 412 else | |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
413 if (! isempty (__id)) |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
414 [~, __err] = lastwarn; |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
415 __mismatch = ! strcmp (__err, __id); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
416 else |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
417 __err = trimerr (lastwarn, "warning"); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
418 __mismatch = isempty (regexp (__err, __pattern, "once")); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
419 endif |
| 7028 | 420 warning (__warnstate.state, "quiet"); |
| 421 if (isempty (__err)) | |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
422 __msg = sprintf ("%sexpected %s but got no warning\n", |
| 10549 | 423 __signal_fail, __patstr); |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
424 elseif (__mismatch) |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
425 __msg = sprintf ("%sexpected %s but got %s\n", |
| 10549 | 426 __signal_fail, __patstr, __err); |
| 7028 | 427 else |
| 428 __success = 1; | |
| 429 endif | |
| 10549 | 430 endif |
| 5589 | 431 |
| 10549 | 432 catch |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
433 if (! isempty (__id)) |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
434 [~, __err] = lasterr; |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
435 __mismatch = ! strcmp (__err, __id); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
436 else |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
437 __err = trimerr (lasterr, "error"); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
438 __mismatch = isempty (regexp (__err, __pattern, "once")); |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
439 endif |
| 6494 | 440 warning (__warnstate.state, "quiet"); |
| 441 if (__warning) | |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
442 __msg = sprintf ("%sexpected warning %s but got error %s\n", |
| 10549 | 443 __signal_fail, __patstr, __err); |
| 444 elseif (__mismatch) | |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
445 __msg = sprintf ("%sexpected %s but got %s\n", |
| 10549 | 446 __signal_fail, __patstr, __err); |
| 5589 | 447 else |
| 10549 | 448 __success = 1; |
| 5589 | 449 endif |
| 10549 | 450 end_try_catch |
| 451 clear __test__; | |
| 5589 | 452 endif |
| 8506 | 453 ## Code already processed. |
| 454 __code = ""; | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
455 |
| 8506 | 456 ### TESTIF |
| 457 | |
| 7242 | 458 elseif (strcmp (__type, "testif")) |
|
14182
f8d99761244c
test: Expand %!testif functionality to multiple conditions
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
459 __e = regexp (__code, '.$', 'lineanchors', 'once'); |
|
14190
68fd9f95e1f9
Don't process comments in %!testif specifications.
Rik <octave@nomad.inbox5.com>
parents:
14182
diff
changeset
|
460 ## Strip comment any comment from testif line before looking for features |
|
68fd9f95e1f9
Don't process comments in %!testif specifications.
Rik <octave@nomad.inbox5.com>
parents:
14182
diff
changeset
|
461 __feat_line = strtok (__code(1:__e), '#%'); |
|
68fd9f95e1f9
Don't process comments in %!testif specifications.
Rik <octave@nomad.inbox5.com>
parents:
14182
diff
changeset
|
462 __feat = regexp (__feat_line, '\w+', 'match'); |
|
14182
f8d99761244c
test: Expand %!testif functionality to multiple conditions
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
463 __have_feat = strfind (octave_config_info ("DEFS"), __feat); |
|
f8d99761244c
test: Expand %!testif functionality to multiple conditions
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
464 if (any (cellfun ("isempty", __have_feat))) |
| 7242 | 465 __xskip++; |
| 10549 | 466 __istest = 0; |
|
10615
08050f37ba49
Don't abort testing when merely skipping a testif block.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
467 __code = ""; # Skip the code. |
| 10549 | 468 __msg = sprintf ("%sskipped test\n", __signal_skip); |
| 7242 | 469 else |
| 470 __istest = 1; | |
| 10549 | 471 __code = __code(__e + 1 : end); |
| 7242 | 472 endif |
| 473 | |
| 8506 | 474 ### TEST |
| 475 | |
| 6728 | 476 elseif (strcmp (__type, "test") || strcmp (__type, "xtest")) |
| 5589 | 477 __istest = 1; |
| 8506 | 478 ## Code will be evaluated below. |
| 479 | |
| 480 ### Comment block. | |
| 481 | |
| 6494 | 482 elseif (strcmp (__block(1:1), "#")) |
| 5589 | 483 __istest = 0; |
| 484 __code = ""; # skip the code | |
| 485 | |
| 8506 | 486 ### Unknown block. |
| 487 | |
| 5589 | 488 else |
| 489 __istest = 1; | |
| 490 __success = 0; | |
| 6494 | 491 __msg = sprintf ("%sunknown test type!\n", __signal_fail); |
| 5589 | 492 __code = ""; # skip the code |
| 493 endif | |
| 494 | |
| 495 ## evaluate code for test, shared, and assert. | |
| 6494 | 496 if (! isempty(__code)) |
| 5589 | 497 try |
|
14066
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
498 ## FIXME: need to check for embedded test functions, which cause |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
499 ## segfaults, until issues with subfunctions in functions are resolved. |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
500 embed_func = regexp (__code, '^\s*function ', 'once', 'lineanchors'); |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
501 if (isempty (embed_func)) |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
502 eval (sprintf ("function %s__test__(%s)\n%s\nendfunction", |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
503 __shared_r,__shared, __code)); |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
504 eval (sprintf ("%s__test__(%s);", __shared_r, __shared)); |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
505 else |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
506 error (["Functions embedded in %!test blocks are not allowed.\n", ... |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
507 "Use the %!function/%!endfunction syntax instead to define shared functions for testing.\n"]); |
|
80bda7c4f012
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
Rik <octave@nomad.inbox5.com>
parents:
13914
diff
changeset
|
508 endif |
| 5589 | 509 catch |
| 6728 | 510 if (strcmp (__type, "xtest")) |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
511 __msg = sprintf ("%sknown failure\n%s", __signal_fail, lasterr ()); |
| 10549 | 512 __xfail++; |
| 6728 | 513 else |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
514 __msg = sprintf ("%stest failed\n%s", __signal_fail, lasterr ()); |
| 10549 | 515 __success = 0; |
| 6728 | 516 endif |
|
12687
6d4c18565de1
Deprecate error_text(), __error_text__()
Rik <octave@nomad.inbox5.com>
parents:
12643
diff
changeset
|
517 if (isempty (lasterr ())) |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
518 error ("empty error text, probably Ctrl-C --- aborting"); |
| 10549 | 519 endif |
| 5589 | 520 end_try_catch |
| 521 clear __test__; | |
| 522 endif | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
523 |
| 8506 | 524 ## All done. Remember if we were successful and print any messages. |
| 6494 | 525 if (! isempty (__msg)) |
| 8506 | 526 ## Make sure the user knows what caused the error. |
| 6494 | 527 if (! __verbose) |
| 10549 | 528 fprintf (__fid, "%s%s\n", __signal_block, __block); |
| 529 fflush (__fid); | |
| 5589 | 530 endif |
| 531 fputs (__fid, __msg); | |
|
9996
929e53107f09
Add newline to message output of test.m
Rik <rdrider0-list@yahoo.com>
parents:
9051
diff
changeset
|
532 fputs (__fid, "\n"); |
| 5908 | 533 fflush (__fid); |
| 8506 | 534 ## Show the variable context. |
| 7244 | 535 if (! strcmp (__type, "error") && ! strcmp (__type, "testif") |
| 10549 | 536 && ! all (__shared == " ")) |
| 537 fputs (__fid, "shared variables "); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
538 eval (sprintf ("fdisp(__fid,bundle(%s));", __shared)); |
| 10549 | 539 fflush (__fid); |
| 5589 | 540 endif |
| 541 endif | |
| 542 if (__success == 0) | |
| 543 __all_success = 0; | |
| 8506 | 544 ## Stop after one error if not in batch mode. |
| 6494 | 545 if (! __batch) |
| 10549 | 546 if (nargout > 0) |
| 547 __ret1 = __ret2 = 0; | |
| 548 endif | |
| 549 if (__close_fid) | |
| 550 fclose(__fid); | |
| 551 endif | |
| 552 return; | |
| 5589 | 553 endif |
| 554 endif | |
| 555 __tests += __istest; | |
| 6494 | 556 __successes += __success * __istest; |
| 5589 | 557 endfor |
| 6494 | 558 eval (__clear, ""); |
| 5589 | 559 |
| 560 if (nargout == 0) | |
|
8422
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
561 if (__tests || __xfail || __xskip) |
|
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
562 if (__xfail) |
| 10549 | 563 printf ("PASSES %d out of %d tests (%d expected failures)\n", |
| 564 __successes, __tests, __xfail); | |
|
8422
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
565 else |
| 10549 | 566 printf ("PASSES %d out of %d tests\n", __successes, __tests); |
|
8422
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
567 endif |
|
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
568 if (__xskip) |
| 10549 | 569 printf ("Skipped %d tests due to missing features\n", __xskip); |
|
8422
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
570 endif |
| 6730 | 571 else |
|
8422
20cbb0fdab48
test.m: print "has no tests" message if there are demos but no tests
John W. Eaton <jwe@octave.org>
parents:
8202
diff
changeset
|
572 printf ("%s%s has no tests available\n", __signal_empty, __file); |
| 7242 | 573 endif |
| 5589 | 574 elseif (__grabdemo) |
| 575 __ret1 = __demo_code; | |
| 576 __ret2 = __demo_idx; | |
| 6494 | 577 elseif (nargout == 1) |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
578 __ret1 = __all_success; |
| 5589 | 579 else |
| 580 __ret1 = __successes; | |
| 581 __ret2 = __tests; | |
| 6730 | 582 __ret3 = __xfail; |
| 7242 | 583 __ret4 = __xskip; |
| 5589 | 584 endif |
| 585 endfunction | |
| 586 | |
| 8506 | 587 ## Create structure with fieldnames the name of the input variables. |
| 6494 | 588 function s = varstruct (varargin) |
| 589 for i = 1:nargin | |
| 590 s.(deblank (argn(i,:))) = varargin{i}; | |
| 5589 | 591 endfor |
| 592 endfunction | |
| 593 | |
| 8506 | 594 ## Find [start,end] of fn in 'function [a,b] = fn'. |
| 6494 | 595 function pos = function_name (def) |
| 5589 | 596 pos = []; |
| 597 | |
| 8506 | 598 ## Find the end of the name. |
| 6494 | 599 right = find (def == "(", 1); |
| 600 if (isempty (right)) | |
| 601 return; | |
| 602 endif | |
| 603 right = find (def(1:right-1) != " ", 1, "last"); | |
| 5589 | 604 |
| 8506 | 605 ## Find the beginning of the name. |
| 6494 | 606 left = max ([find(def(1:right)==" ", 1, "last"), ... |
| 10549 | 607 find(def(1:right)=="=", 1, "last")]); |
| 6494 | 608 if (isempty (left)) |
| 609 return; | |
| 610 endif | |
| 5589 | 611 left++; |
| 612 | |
| 8506 | 613 ## Return the end points of the name. |
| 6494 | 614 pos = [left, right]; |
| 5589 | 615 endfunction |
| 616 | |
| 8506 | 617 ## Strip <pattern> from '<pattern> code'. |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
618 ## Also handles 'id=ID code' |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
619 function [pattern, id, rest] = getpattern (str) |
| 6494 | 620 pattern = "."; |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
621 id = []; |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
622 rest = str; |
| 6494 | 623 str = trimleft (str); |
| 624 if (! isempty (str) && str(1) == "<") | |
| 625 close = index (str, ">"); | |
| 626 if (close) | |
| 5589 | 627 pattern = str(2:close-1); |
| 628 rest = str(close+1:end); | |
| 629 endif | |
|
10398
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
630 elseif (strncmp (str, "id=", 3)) |
|
f7cf1a53e1c5
support ID test for errors and warningsin test suites
Jaroslav Hajek <highegg@gmail.com>
parents:
10130
diff
changeset
|
631 [id, rest] = strtok (str(4:end)); |
| 5589 | 632 endif |
| 633 endfunction | |
| 634 | |
| 8506 | 635 ## Strip '.*prefix:' from '.*prefix: msg\n' and strip trailing blanks. |
| 6494 | 636 function msg = trimerr (msg, prefix) |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7244
diff
changeset
|
637 idx = index (msg, cstrcat (prefix, ":")); |
| 6494 | 638 if (idx > 0) |
| 639 msg(1:idx+length(prefix)) = []; | |
| 640 endif | |
| 641 msg = trimleft (deblank (msg)); | |
| 5589 | 642 endfunction |
| 643 | |
| 8506 | 644 ## Strip leading blanks from string. |
| 6494 | 645 function str = trimleft (str) |
| 646 idx = find (isspace (str)); | |
| 647 leading = find (idx == 1:length(idx)); | |
| 648 if (! isempty (leading)) | |
| 5589 | 649 str = str(leading(end)+1:end); |
| 650 endif | |
| 651 endfunction | |
| 652 | |
| 8506 | 653 ## Make a structure out of the named variables |
| 654 ## (based on Etienne Grossmann's tar function). | |
| 6494 | 655 function s = bundle (varargin) |
| 656 for i = 1:nargin | |
| 657 s.(deblank (argn(i,:))) = varargin{i}; | |
| 7151 | 658 endfor |
| 5589 | 659 endfunction |
| 660 | |
| 661 function body = __extract_test_code (nm) | |
| 662 fid = fopen (nm, "rt"); | |
| 663 body = []; | |
| 664 if (fid >= 0) | |
| 6494 | 665 while (! feof (fid)) |
| 5589 | 666 ln = fgetl (fid); |
| 6494 | 667 if (length (ln) >= 2 && strcmp (ln(1:2), "%!")) |
| 5589 | 668 body = [body, "\n"]; |
| 669 if (length(ln) > 2) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7244
diff
changeset
|
670 body = cstrcat (body, ln(3:end)); |
| 5589 | 671 endif |
| 672 endif | |
| 673 endwhile | |
| 674 fclose (fid); | |
| 675 endif | |
| 676 endfunction | |
| 677 | |
| 8506 | 678 ### Test for test for missing features |
| 7242 | 679 %!testif OCTAVE_SOURCE |
| 680 %! ## This test should be run | |
| 681 %! assert (true); | |
| 7243 | 682 |
| 683 ### Disable this test to avoid spurious skipped test for "make check" | |
| 684 % !testif HAVE_FOOBAR | |
| 685 % ! ## missing feature. Fail if this test is run | |
| 686 % ! error("Failed missing feature test"); | |
| 7242 | 687 |
| 6728 | 688 ### Test for a known failure |
| 689 %!xtest error("This test is known to fail") | |
| 690 | |
| 5589 | 691 ### example from toeplitz |
|
13914
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
692 %!shared msg1,msg2 |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
693 %! msg1="C must be a vector"; |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
694 %! msg2="C and R must be vectors"; |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
695 %!fail ('toeplitz([])', msg1); |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
696 %!fail ('toeplitz([1,2;3,4])', msg1); |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
697 %!fail ('toeplitz([1,2],[])', msg2); |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
698 %!fail ('toeplitz([1,2],[1,2;3,4])', msg2); |
|
4b1ce071f504
test.m: Update tests which depend on error messages changed in toeplitz.m
Rik <octave@nomad.inbox5.com>
parents:
13305
diff
changeset
|
699 %!fail ('toeplitz ([1,2;3,4],[1,2])', msg2); |
| 5589 | 700 % !fail ('toeplitz','usage: toeplitz'); # usage doesn't generate an error |
| 701 % !fail ('toeplitz(1, 2, 3)', 'usage: toeplitz'); | |
| 702 %!test assert (toeplitz ([1,2,3], [1,4]), [1,4; 2,1; 3,2]); | |
| 703 %!demo toeplitz ([1,2,3,4],[1,5,6]) | |
| 704 | |
| 705 ### example from kron | |
| 5775 | 706 %!#error kron # FIXME suppress these until we can handle output |
| 5589 | 707 %!#error kron(1,2,3) |
| 708 %!test assert (isempty (kron ([], rand(3, 4)))) | |
| 709 %!test assert (isempty (kron (rand (3, 4), []))) | |
| 710 %!test assert (isempty (kron ([], []))) | |
| 711 %!shared A, B | |
| 712 %!test | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
713 %! A = [1, 2, 3; 4, 5, 6]; |
| 5589 | 714 %! B = [1, -1; 2, -2]; |
| 715 %!assert (size (kron (zeros (3, 0), A)), [ 3*rows(A), 0 ]) | |
| 716 %!assert (size (kron (zeros (0, 3), A)), [ 0, 3*columns(A) ]) | |
| 717 %!assert (size (kron (A, zeros (3, 0))), [ 3*rows(A), 0 ]) | |
| 718 %!assert (size (kron (A, zeros (0, 3))), [ 0, 3*columns(A) ]) | |
| 719 %!assert (kron (pi, e), pi*e) | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
720 %!assert (kron (pi, A), pi*A) |
| 5589 | 721 %!assert (kron (A, e), e*A) |
| 722 %!assert (kron ([1, 2, 3], A), [ A, 2*A, 3*A ]) | |
| 723 %!assert (kron ([1; 2; 3], A), [ A; 2*A; 3*A ]) | |
| 724 %!assert (kron ([1, 2; 3, 4], A), [ A, 2*A; 3*A, 4*A ]) | |
| 725 %!test | |
| 726 %! res = [1,-1,2,-2,3,-3; 2,-2,4,-4,6,-6; 4,-4,5,-5,6,-6; 8,-8,10,-10,12,-12]; | |
| 727 %! assert (kron (A, B), res) | |
| 728 | |
| 729 ### an extended demo from specgram | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
730 %!#demo |
| 5589 | 731 %! ## Speech spectrogram |
| 732 %! [x, Fs] = auload(file_in_loadpath("sample.wav")); # audio file | |
| 733 %! step = fix(5*Fs/1000); # one spectral slice every 5 ms | |
| 734 %! window = fix(40*Fs/1000); # 40 ms data window | |
| 735 %! fftn = 2^nextpow2(window); # next highest power of 2 | |
| 736 %! [S, f, t] = specgram(x, fftn, Fs, window, window-step); | |
| 737 %! S = abs(S(2:fftn*4000/Fs,:)); # magnitude in range 0<f<=4000 Hz. | |
| 738 %! S = S/max(max(S)); # normalize magnitude so that max is 0 dB. | |
| 739 %! S = max(S, 10^(-40/10)); # clip below -40 dB. | |
| 740 %! S = min(S, 10^(-3/10)); # clip above -3 dB. | |
| 741 %! imagesc(flipud(20*log10(S)), 1); | |
| 742 %! % you should now see a spectrogram in the image window | |
| 743 | |
| 744 | |
| 745 ### now test test itself | |
| 746 | |
| 747 %!## usage and error testing | |
| 748 % !fail ('test','usage.*test') # no args, generates usage() | |
| 749 % !fail ('test(1,2,3,4)','usage.*test') # too many args, generates usage() | |
| 750 %!fail ('test("test", "bogus")','unknown flag') # incorrect args | |
| 751 %!fail ('garbage','garbage.*undefined') # usage on nonexistent function should be | |
| 752 | |
| 7940 | 753 %!error test # no args, generates usage() |
| 754 %!error test(1,2,3,4) # too many args, generates usage() | |
| 5589 | 755 %!error <unknown flag> test("test", 'bogus'); # incorrect args, generates error() |
| 756 %!error <garbage' undefined> garbage # usage on nonexistent function should be | |
| 757 | |
| 758 %!error test("test", 'bogus'); # test without pattern | |
| 759 | |
| 5681 | 760 %!test |
| 761 %! lastwarn(); # clear last warning just in case | |
| 762 | |
| 5781 | 763 %!warning <warning message> warning('warning message'); |
| 5589 | 764 |
| 765 %!## test of shared variables | |
| 766 %!shared a # create a shared variable | |
| 767 %!test a=3; # assign to a shared variable | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
768 %!test assert(a,3) # variable should equal 3 |
| 5589 | 769 %!shared b,c # replace shared variables |
| 770 %!test assert (!exist("a")); # a no longer exists | |
| 771 %!test assert (isempty(b)); # variables start off empty | |
| 772 %!shared a,b,c # recreate a shared variable | |
| 773 %!test assert (isempty(a)); # value is empty even if it had a previous value | |
| 774 %!test a=1; b=2; c=3; # give values to all variables | |
| 775 %!test assert ([a,b,c],[1,2,3]); # test all of them together | |
| 776 %!test c=6; # update a value | |
| 777 %!test assert([a, b, c],[1, 2, 6]); # show that the update sticks | |
| 778 %!shared # clear all shared variables | |
| 779 %!test assert(!exist("a")) # show that they are cleared | |
| 780 %!shared a,b,c # support for initializer shorthand | |
| 781 %! a=1; b=2; c=4; | |
| 782 | |
| 783 %!function x = __test_a(y) | |
| 784 %! x = 2*y; | |
|
13305
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
785 %!endfunction |
| 5589 | 786 %!assert(__test_a(2),4); # Test a test function |
| 787 | |
| 788 %!function __test_a (y) | |
| 789 %! x = 2*y; | |
|
13305
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
790 %!endfunction |
| 5589 | 791 %!test |
| 792 %! __test_a(2); # Test a test function with no return value | |
| 793 | |
| 794 %!function [x,z] = __test_a (y) | |
| 795 %! x = 2*y; | |
| 796 %! z = 3*y; | |
|
13305
63463570d9fe
Add %!endfunction block keyword to test.m
Rik <octave@nomad.inbox5.com>
parents:
12687
diff
changeset
|
797 %!endfunction |
| 5589 | 798 %!test # Test a test function with multiple returns |
| 799 %! [x,z] = __test_a(3); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
800 %! assert(x,6); |
| 5589 | 801 %! assert(z,9); |
| 802 | |
| 803 %!## test of assert block | |
| 804 %!assert (isempty([])) # support for test assert shorthand | |
| 805 | |
| 806 %!## demo blocks | |
| 807 %!demo # multiline demo block | |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14190
diff
changeset
|
808 %! t = [0:0.01:2*pi]; x = sin (t); |
|
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14190
diff
changeset
|
809 %! plot (t,x); |
| 5589 | 810 %! % you should now see a sine wave in your figure window |
| 811 %!demo a=3 # single line demo blocks work too | |
| 812 | |
| 813 %!## this is a comment block. it can contain anything. | |
| 814 %!## | |
| 815 %! it is the "#" as the block type that makes it a comment | |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14190
diff
changeset
|
816 %! and it stays as a comment even through continuation lines |
| 5589 | 817 %! which means that it works well with commenting out whole tests |
| 818 | |
| 819 % !# failure tests. All the following should fail. These tests should | |
| 820 % !# be disabled unless you are developing test() since users don't | |
| 821 % !# like to be presented with expected failures. I use % ! to disable. | |
| 822 % !test error("---------Failure tests. Use test('test','verbose',1)"); | |
| 823 % !test assert([a,b,c],[1,3,6]); # variables have wrong values | |
| 824 % !bogus # unknown block type | |
| 825 % !error toeplitz([1,2,3]); # correct usage | |
| 826 % !test syntax errors) # syntax errors fail properly | |
| 827 % !shared garbage in # variables must be comma separated | |
| 828 % !error syntax++error # error test fails on syntax errors | |
| 829 % !error "succeeds."; # error test fails if code succeeds | |
| 830 % !error <wrong pattern> error("message") # error pattern must match | |
| 831 % !demo with syntax error # syntax errors in demo fail properly | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
832 % !shared a,b,c |
| 5589 | 833 % !demo # shared variables not available in demo |
| 834 % ! assert(exist("a")) | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
835 % !error |
| 5589 | 836 % ! test('/etc/passwd'); |
| 837 % ! test("nonexistent file"); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
838 % ! ## These don't signal an error, so the test for an error fails. Note |
| 5589 | 839 % ! ## that the call doesn't reference the current fid (it is unavailable), |
| 840 % ! ## so of course the informational message is not printed in the log. | |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14190
diff
changeset
|
841 |