Mercurial > forge
changeset 11801:d16614b361c8 octave-forge
new test
| author | abarth93 |
|---|---|
| date | Sat, 15 Jun 2013 19:36:59 +0000 |
| parents | 0a5ace662bd1 |
| children | bcc5905ef2b6 |
| files | main/netcdf/src/Makefile main/netcdf/src/private/test_scalar_variable.m main/netcdf/src/test_netcdf_package.m main/netcdf/src/test_netcdf_package_type.m |
| diffstat | 4 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/main/netcdf/src/Makefile Sat Jun 15 19:32:44 2013 +0000 +++ b/main/netcdf/src/Makefile Sat Jun 15 19:36:59 2013 +0000 @@ -20,6 +20,7 @@ check: PKG_ADD netcdf_package.oct (mkdir tmp; cd tmp; octave --eval "pkg unload octcdf; addpath $$PWD/..; test_netcdf_package") +# (mkdir tmp; cd tmp; octave --eval "pkg unload octcdf; addpath $$PWD/..; test_netcdf_package") # (cd ..; octave --eval "pkg unload octcdf; addpath $$PWD/netcdf; test_netcdf_package")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/main/netcdf/src/private/test_scalar_variable.m Sat Jun 15 19:36:59 2013 +0000 @@ -0,0 +1,5 @@ +fname = [tempname '-octave-netcdf.nc']; +ncid = netcdf.create(fname,'NC_CLOBBER'); +varidd_scalar = netcdf.defVar(ncid,'double_scalar','double',[]); +netcdf.close(ncid); +delete(fname);
--- a/main/netcdf/src/test_netcdf_package.m Sat Jun 15 19:32:44 2013 +0000 +++ b/main/netcdf/src/test_netcdf_package.m Sat Jun 15 19:36:59 2013 +0000 @@ -2,7 +2,9 @@ libver = netcdf.inqLibVers(); -ncid = netcdf.create('foo.nc','NC_CLOBBER'); +fname = [tmpnam '-octave-netcdf.nc']; + +ncid = netcdf.create(fname,'NC_CLOBBER'); assert(strcmp(netcdf.inqFormat(ncid),'FORMAT_CLASSIC')); assert(netcdf.getConstant('NC_NOWRITE') == 0) @@ -105,6 +107,7 @@ netcdf.close(ncid); +delete(fname); test_netcdf_package_type('byte','int8'); test_netcdf_package_type('ubyte','uint8'); @@ -121,11 +124,6 @@ test_netcdf_package_type('char','char'); -fname = [tempname '-octave-netcdf.nc']; -ncid = netcdf.create(fname,'NC_CLOBBER'); -varidd_scalar = netcdf.defVar(ncid,'double_scalar','double',[]); -netcdf.close(ncid); -delete(fname); - +test_scalar_variable test_netcdf_hl
--- a/main/netcdf/src/test_netcdf_package_type.m Sat Jun 15 19:32:44 2013 +0000 +++ b/main/netcdf/src/test_netcdf_package_type.m Sat Jun 15 19:36:59 2013 +0000 @@ -7,8 +7,8 @@ m = 5; n = 10; -fname = sprintf('foo-%s.nc',nctype); -delete(fname); +fname = [tmpnam '-octave-netcdf- ' nctype '.nc']; + mode = bitor(netcdf.getConstant('NC_CLOBBER'),netcdf.getConstant('NC_NETCDF4')); ncid = netcdf.create(fname,mode); @@ -40,3 +40,4 @@ netcdf.close(ncid); +delete(fname);