# HG changeset patch # User Rik # Date 1334165754 25200 # Node ID 604696c3ff932eb0e7929aab9e2e6d608e9ef9e9 # Parent 1bf39e944e431c638a8b17c450665669ed3f4ae7 maint: Add missing test/nest files to build system. * nest/module.mk: Add missing files to list of test files. * nest/test_nest.m: Use Octave coding standards for %!tests. diff --git a/test/nest/module.mk b/test/nest/module.mk --- a/test/nest/module.mk +++ b/test/nest/module.mk @@ -2,12 +2,14 @@ nest/arg_nest.m \ nest/arg_ret.m \ nest/no_closure.m \ + nest/persistent_nest.m \ nest/recursive_nest.m \ nest/recursive_nest2.m \ nest/recursive_nest3.m \ nest/scope0.m \ nest/scope1.m \ nest/scope2.m \ + nest/scope3.m \ nest/script_nest.m \ nest/script_nest_script.m \ nest/test_nest.m \ @@ -15,3 +17,4 @@ nest/varg_nest2.m FCN_FILES += $(nest_FCN_FILES) + diff --git a/test/nest/test_nest.m b/test/nest/test_nest.m --- a/test/nest/test_nest.m +++ b/test/nest/test_nest.m @@ -16,19 +16,27 @@ ## along with Octave; see the file COPYING. If not, see ## . -%!assert (recursive_nest (), 25); +################################################################################ +## This file actually executes the tests on nested functions. +## +## It relies on the function files defined in the nest/ directory. +################################################################################ -%!assert (recursive_nest2 (), 20); +%!assert (recursive_nest (), 25) -%!assert (recursive_nest3 (), 5); +%!assert (recursive_nest2 (), 20) -%!assert (script_nest (), 5); +%!assert (recursive_nest3 (), 5) -%!assert (arg_ret (), 10); +%!assert (script_nest (), 5) + +%!assert (arg_ret (), 10) -%!assert (varg_nest (-1), 6); +%!assert (arg_nest, 1) -%!assert (varg_nest2, 5); +%!assert (varg_nest (-1), 6) + +%!assert (varg_nest2, 5) %!test %! scope0; @@ -39,8 +47,7 @@ %!test %! scope3; -%!assert (arg_nest, 1); +%!error scope2 +%!error no_closure (0) +%!error no_closure (1) -%!error scope2; -%!error no_closure (0); -%!error no_closure (1);