Mercurial > octave

changeset 18054:70e83c641b48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Accept a bare directory name for rundemos and runtests. * rundemos.m, runtests.m: Use isdir to check whether input is a directory.
author Rik <rik@octave.org>
date Tue, 03 Dec 2013 09:35:54 -0800
parents 7c9148b235eb
children b675665ce328
files scripts/testfun/rundemos.m scripts/testfun/runtests.m
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/testfun/rundemos.m	Tue Dec 03 09:04:09 2013 -0800
+++ b/scripts/testfun/rundemos.m	Tue Dec 03 09:35:54 2013 -0800
@@ -38,18 +38,17 @@
   elseif (nargin == 1)
     if (is_absolute_filename (directory))
       dirs = {directory};
-    elseif (is_rooted_relative_filename (directory))
+    elseif (isdir (directory))
       dirs = {canonicalize_file_name(directory)};
     else
       if (directory(end) == filesep ())
         directory = directory(1:end-1);
       endif
       fullname = find_dir_in_path (directory);
-      if (! isempty (fullname))
-        dirs = {fullname};
-      else
+      if (isempty (fullname))
         error ("rundemos: DIRECTORY argument must be a valid pathname");
       endif
+      dirs = {fullname};
     endif
     do_class_dirs = false;
   else
--- a/scripts/testfun/runtests.m	Tue Dec 03 09:04:09 2013 -0800
+++ b/scripts/testfun/runtests.m	Tue Dec 03 09:35:54 2013 -0800
@@ -38,18 +38,17 @@
   elseif (nargin == 1)
     if (is_absolute_filename (directory))
       dirs = {directory};
-    elseif (is_rooted_relative_filename (directory))
+    elseif (isdir (directory))
       dirs = {canonicalize_file_name(directory)};
     else
       if (directory(end) == filesep ())
         directory = directory(1:end-1);
       endif
       fullname = find_dir_in_path (directory);
-      if (! isempty (fullname))
-        dirs = {fullname};
-      else
+      if (isempty (fullname))
         error ("runtests: DIRECTORY argument must be a valid pathname");
       endif
+      dirs = {fullname};
     endif
     do_class_dirs = false;
   else