Mercurial > forge
changeset 12279:128e60bc1c08 octave-forge
Provide default test file name
| author | prnienhuis |
|---|---|
| date | Wed, 01 Jan 2014 22:41:33 +0000 |
| parents | eb429e18492e |
| children | bf7238a29d2f |
| files | main/io/inst/io_ods_testscript.m main/io/inst/io_xls_testscript.m |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/main/io/inst/io_ods_testscript.m Wed Jan 01 22:33:35 2014 +0000 +++ b/main/io/inst/io_ods_testscript.m Wed Jan 01 22:41:33 2014 +0000 @@ -23,7 +23,9 @@ ## @var{intf1} can be one of OTK, JOD, UNO, or OCT. No checks ## are made as to whether the requested interface is supported at all. If ## @var{fname} is supplied, that filename is used for the tests, otherwise -## filename "io-test.ods" is chosen by default. +## filename "io-test.ods" is chosen by default. This parameter is required +## to have e.g., JOD distinguish between testing (reading) .ods (ODS 1.2) +## and .sxc (old OpenOffice.org & StarOffice) files (that UNO can write). ## ## If @var{intf2} is supplied, that interface will be used for writing the ## spreadsheet file and @var{intf1} will be used for reading. The OCT @@ -46,8 +48,9 @@ ## 2013-12-18 Add option to write and read with different interfaces (needed for OCT) ## '' Catch more erroneous read-back results ## 2013-12-31 More extensive texinfo help text +## '' Provide default test file name -function io_ods_testscript (intf, fname, intf2='') +function io_ods_testscript (intf, fname="io-test.ods", intf2='') printf ("\nTesting .ods interface %s using file %s...\n", upper (intf), fname);
--- a/main/io/inst/io_xls_testscript.m Wed Jan 01 22:33:35 2014 +0000 +++ b/main/io/inst/io_xls_testscript.m Wed Jan 01 22:41:33 2014 +0000 @@ -51,9 +51,10 @@ ## 2013-12-31 More extensive texinfo help text ## 2013-12-31 Style fixes ## '' Also delay a bit if write intf2 = UNO to avoid unzip errors -## 2014-01-01 Provisionally fall back to COM or POI for intf2 +## 2014-01-01 Provisionally fall back to COM or POI for intf2 +## '' Provide default test file name -function io_xls_testscript (intf, fname, intf2=[]) +function io_xls_testscript (intf, fname="io-test.xls", intf2=[]) printf ("\nTesting .xls interface %s using file %s...\n", upper (intf), fname);