Mercurial > octave-nkf

diff scripts/testfun/rundemos.m @ 17148:fa14aa77b514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow relative directory name for rundemos/runtests. * scripts/testfun/rundemos.m: Use canonicalize_file_name if directory is relative. Use readdir() rather than dir() for performance. *scripts/testfun/runtests.m: Use canonicalize_file_name if directory is relative. Use readdir() rather than dir() for performance. Add %!error blocks.
author Rik <rik@octave.org>
date Fri, 02 Aug 2013 09:01:55 -0700
parents b7667fcb9fbc
children 2c2a6801cb57
line wrap: on
line diff
--- a/scripts/testfun/rundemos.m	Fri Aug 02 14:30:58 2013 +0100
+++ b/scripts/testfun/rundemos.m	Fri Aug 02 09:01:55 2013 -0700
@@ -34,8 +34,12 @@
   elseif (nargin == 1)
     if (is_absolute_filename (directory))
       dirs = {directory};
+    elseif (is_rooted_relative_filename (directory))
+      dirs = {canonicalize_file_name(directory)};
     else
-      directory = regexprep (directory, ['\',filesep(),'$'], "");
+      if (directory(end) == filesep ())
+        directory = directory(1:end-1);
+      endif
       fullname = find_dir_in_path (directory);
       if (! isempty (fullname))
         dirs = {fullname};
@@ -55,8 +59,7 @@
 endfunction
 
 function run_all_demos (directory)
-  dirinfo = dir (directory);
-  flist = {dirinfo.name};
+  flist = readdir (directory);
   for i = 1:numel (flist)
     f = flist{i};
     if (length (f) > 2 && strcmp (f((end-1):end), ".m"))