Mercurial > octave-nkf
diff scripts/miscellaneous/zip.m @ 20117:d6e523825abc
zip.m: fix XFAIL on Windows; fix test (bug #44811).
* zip.m: Don't use multiple commands in one system call since shell cmd
separator is different between Windows and UNIX. Correct "extension" to
"ext" to match real variable name in BIST test.
| author | Philip Nienhuis <prnienhuis@users.sf.net> |
|---|---|
| date | Fri, 17 Apr 2015 08:34:25 -0700 |
| parents | 0cc365dada52 |
| children |
line wrap: on
line diff
--- a/scripts/miscellaneous/zip.m Thu Apr 16 09:35:01 2015 -0700 +++ b/scripts/miscellaneous/zip.m Fri Apr 17 08:34:25 2015 -0700 @@ -55,10 +55,12 @@ zipfile = make_absolute_filename (zipfile); - cmd = sprintf ("cd %s; zip -r %s %s", - rootdir, zipfile, sprintf (" %s", files{:})); + cmd = sprintf ("zip -r %s %s", zipfile, sprintf (" %s", files{:})); + origdir = pwd (); + cd (rootdir); [status, output] = system (cmd); + cd (origdir); if (status) error ("zip: zip failed with exit status = %d", status); @@ -108,7 +110,7 @@ %! endif %! unwind_protect_cleanup %! unlink (filename); -%! unlink ([dirname, filesep, basename, extension]); +%! unlink ([dirname, filesep, basename, ext]); %! rmdir (dirname); %! end_unwind_protect