Mercurial > hg > octave-lyh

changeset 8443:34c0acf11539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix error messages in __xzip__
author Thorsten Meyer <thorsten.meyier@gmx.de>
date Mon, 05 Jan 2009 08:12:10 +0100
parents 502e58a0d44f
children c3ac9f2772cd
files scripts/ChangeLog scripts/miscellaneous/__xzip__.m
diffstat 2 files changed, 27 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-01  Thorsten Meyer  <thorsten.meyier@gmx.de>
+
+	* miscellaneous/__xzip__.m: Fix error messages, add tests.
+	
 2008-12-26  Thorsten Meyer  <thorsten.meyier@gmx.de>
 
 	* general/int2str.m, general/num2str.m, strings/base2dec.m,
--- a/scripts/miscellaneous/__xzip__.m
+++ b/scripts/miscellaneous/__xzip__.m
@@ -34,8 +34,7 @@
 
   if (nargin == 4 || nargin == 5)
     if (! ischar (extension) || length (extension) == 0)
-      error (sprintf("%s: extension has to be a string with finite length",
-                     commandname));
+      error ("__xzip__: extension has to be a string with finite length");
     endif
     
     if (nargin == 5 && ! exist (outdir, "dir"))
@@ -83,15 +82,15 @@
           ## FIXME this does not work when you try to compress directories
 
           compressed_files  = cellfun(@(x) sprintf ("%s.%s", x, extension), 
-                            files, "UniformOutput", false);
+                                      files, "UniformOutput", false);
         endif
 
         if (nargout > 0)
           entries = compressed_files;
         endif
       else
-        error (sprintf("%s command failed with exit status = %d", 
-                       commandname, status));
+        error ("%s command failed with exit status = %d",
+               commandname, status);
       endif
     unwind_protect_cleanup
       cd(cwd);
@@ -119,3 +118,22 @@
   d(idx) = "";
   f(idx) = files(idx);
 endfunction
+
+%!error <extension has to be a string with finite length> 
+%!  __xzip__("gzip", "", "gzip -r %s", "bla");
+%!error <no files to move>
+%!  __xzip__("gzip", ".gz", "gzip -r %s", tmpnam);
+%!error <command failed with exit status>
+%!  # test __xzip__ with invalid compression command
+%!  unwind_protect
+%!    filename = tmpnam;
+%!    dummy    = 1;
+%!    save(filename, "dummy");
+%!    dirname  = tmpnam;
+%!    mkdir(dirname);
+%!    entry = __xzip__("gzip", ".gz", "xxxzipxxx -r %s 2>/dev/null", 
+%!                     filename, dirname);
+%!  unwind_protect_cleanup
+%!    delete(filename);
+%!    rmdir(dirname);
+%!  end_unwind_protect