Mercurial > octave
changeset 25175:8fdc6df8bab0
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 09 Apr 2018 11:01:29 -0400 |
| parents | ff3d24a818a1 (current diff) 6fdfe4127f0f (diff) |
| children | dcd14fd0c5db |
| files | test/deprecate-props.tst |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/test/deprecate-props.tst Mon Apr 09 08:22:32 2018 -0400 +++ b/test/deprecate-props.tst Mon Apr 09 11:01:29 2018 -0400 @@ -20,11 +20,8 @@ ## values (radio strings only) should not be accepted, in a given future ## version. Don't forget to add a note in the NEWS file. -%!function testprop (h, prop, vrs, val = []) -%! vrsmax = strsplit (vrs, "."); -%! vrscur = strsplit (version (), "."); -%! if (num2str (vrsmax{1}) < num2str (vrscur{1}) || -%! num2str (vrsmax{2}) < num2str (vrscur{2})) +%!function testprop (h, prop, removal_version, val = []) +%! if (compare_versions (version (), removal_version, ">=")) %! if (isempty (val) && isprop (h, prop)) %! error ("Please remove %s property %s", get (h, "type"), prop); %! elseif (! isempty (val) && any (strcmp (val, set (h, prop))))