Commit Graph

207 Commits

Author SHA1 Message Date
Dennis Heimbigner
39a5bf5efa Modify ncdap_test/test_nstride_cached.c
to use a dataset on remotetest instead
of an external server.
2014-07-01 10:39:18 -06:00
Ward Fisher
7f812b367e Manual merge of pull request https://github.com/Unidata/netcdf-c/pull/64 contributed by nschloe. Assorted CMake improvements. 2014-06-11 15:51:31 -06:00
Ward Fisher
00849a4b7a Modified test so that failing to resolve test server returns an appropriate message but does not return an error code. 2014-04-29 10:03:47 +02:00
Ward Fisher
d0c958cd27 Merge branch 'sub_doc'
Working on reformatting the netcdf documents. Not complete yet, but off to a good start.
2014-04-23 11:04:57 -06:00
Ward Fisher
57f7186e7d Changed the return code from 1 to 0 when test_varm3 cannot find the remote server. In this instance, the test does not fail, it simply does not run. 2014-04-23 10:59:35 -06:00
Ward Fisher
e968429a0c Cleaned up CMake configuration file a little bit. 2014-04-22 14:51:57 -06:00
Ward Fisher
44fae42214 Cleaned up indentation, white space in multiple CMakeLists.txt files. 2014-04-21 11:15:33 -06:00
dmh
98d27e838d [NCF-299]
When a .dodsrc file is present, and
specifies user name and password,
it is being ignored after the first time.

Fix required a major rewrite of ocrc.c because
it was mishandling a number of .dodsrc entries.
2014-04-16 14:08:12 -06:00
dmh
4346b01c19 note jna problem 2014-04-15 21:25:44 -06:00
dmh
b524e151ef Remove last vestiges of thredds-test 2014-03-14 14:07:35 -06:00
Ward Fisher
1480ae77a9 Added test_varm3 back in to the list of active tests, to keep it in step with autotools.
Corrected configure.ac; CURLOPT_RESPONSE_CODE should have been CURLINFO_RESPONSE_CODE.
2014-03-13 10:06:12 -06:00
dmh
06b4c10ed1 coads_climatology test (tst_varm3) now works, t_auth still does not 2014-03-12 20:09:01 -06:00
dmh
f3f7a9814b update the url in t_auth 2014-03-11 10:37:37 -06:00
dmh
a1f8d0a761 turn on tst_auth 2014-03-10 16:40:52 -06:00
dmh
a189b98b0b 1. Any test that references nctestserver/NC_findtestserver
should be under ENABLE_DAP_REMOTE_TESTS.
   Fixed to make sure that this is so.
   Also attempted to fix ncdap_test/CMakeLists.txt,
   but probably got it wrong.
   HT to Nico Schlomer.
2. Attempted to reduce the number of conversion errors
   when -Wconversion is set. Fixed oc2, but
   rest of netcdf remains to be done.
   HT to Nico Schlomer.
3. When doing #2, I discovered an error in ncgen.y
   that has remained hidden. This required some other
   test case fixes.
2014-03-08 20:41:30 -07:00
Ward Fisher
c72ac7219e Added ENABLE_DAP_AUTH_TESTS flag to CMakelists files. 2014-03-07 13:58:09 -07:00
dmh
e3545bf88d 1. Allow files to be opened by name multiple
times, but returning the same ncid.
2. Separate out the dap auth tests
   and make them disabled by default.
3. turn of ncdap_test/test_varm3 until
   we can find a copy of coads_climatology.nc
2014-03-07 12:04:38 -07:00
Ward Fisher
16400df5e0 Resolved Conflict when cherry-picking patches. 2014-02-06 11:33:31 -07:00
Ward Fisher
9b0a98383a Added CMakeLists.txt to missing Makefile.am files, so that CMake-based builds can be used on source packages generated by make dist 2014-02-06 11:32:32 -07:00
Ward Fisher
9fa9e6a88f Having problems finding a syntax that works for both OSX and Linux, added a platform check instead. Perhaps this will work. 2014-01-22 10:41:59 -07:00
Ward Fisher
37a329f97e Updated comparison to work on Linux as well as OSX. 2014-01-22 10:19:47 -07:00
Ward Fisher
90de6044cc Updated comparison to work on Linux as well as OSX. 2014-01-22 09:53:26 -07:00
Ward Fisher
a708984b69 OSX ‘expr’ is built on BSD expr, which does not contain the ‘index’ directive. This work around allows this test to work on OSX and linux. 2014-01-22 09:45:54 -07:00
dmh
dfc3749506 [NCF-282]/ HAD-595112
The code that tests if a path is a url is
faulting when the url does not end in a slash
(e.g. http://thredds-tests.ucar.edu).
The code that tests if a path is a url is
faulting when the url does not end in a slash
(e.g. http://thredds-tests.ucar.edu).
CF-273]/HZY-708311

Solution was to do a null pointer test.
Added a test (tst_misc).
2014-01-20 16:11:45 -07:00
dmh
6a6891b72b fixed testing of constrained test for ncdap 2014-01-19 13:01:50 -07:00
Ward Fisher
0032af978b Added INQ_FORMAT_EXTENDED-related tests to the cmake build system (based on inclusion in autotools-based builds). 2014-01-16 13:14:49 -07:00
dmh
582410a407 [NCF-273]/HZY-708311
Add a new function called nc_inq_format_extended that
returns more detailed format information (vis-a-vis
nc_inq_format) about an open dataset.

Note that the netcdf API will present the file as if it had
the format specified by nc_inq_format.  The true file
format, however, may not even be a netcdf file; it might be
DAP, HDF4, or PNETCDF, for example. This function returns
that true file type.  It also returns the effective mode for
the file.

signature: nc_inq_format_extended(int ncid, int* formatp, int* modep)
where
* ncid is the NetCDF ID from a previous call to nc_open() or
  nc_create().
* formatp is a pointer to a location for returned true format.
* modep is a pointer to a location for returned mode flags.

Refer to the actual list in the file netcdf.h to see the
currently defined set.

Also added test cases (tst_formatx*).
2013-12-22 12:53:20 -07:00
dmh
d6061db87d define mode_t when under windows 2013-11-15 15:41:17 -07:00
dmh
c9bb8c0abf Add http auth test to cmake 2013-11-15 13:44:27 -07:00
dmh
baed147ba4 [NCF-277]
Fix Http Basic Authorization.
The problem is really in oc2.0.
In order for it to work,
the CURLOPT_COOKIEJAR must have
a non-null value. The code
was already there, but not being
used for some reason.
1. fixed cookiejar code in oc2.0
2. synched oc2.0 with netcdf-c/oc2
3. added a test case
2013-11-15 11:38:54 -07:00
Ward Fisher
5421016565 For some reason, the stack-allocated memory stopped working on Windows, for all versions of the file, not just the HEAD. Changing it over to heap-allocated memory seems to have fixed the problem. No Idea why this sprang up out of nowhere. 2013-09-09 12:58:42 -06:00
Dennis Heimbigner
628aed80d9 1. synch changes with oc2.0
2. Fix a bug in ncgen to
   catch a special case of a malformed
   datalist.
2013-06-26 18:55:30 +00:00
Ward Fisher
33d3d06971 Added initial 'make dist', 'make distcheck' support to
CMake-based builds.
2013-06-03 16:42:04 +00:00
Dennis Heimbigner
77d27faaef suppress useless test output from test_nstride_cached.c 2013-04-30 18:34:31 +00:00
Ward Fisher
67f96188ff Merged latest from netCDF-cmake branch in preparation for 4.3.0 release. 2013-04-23 21:50:07 +00:00
Dennis Heimbigner
e3a4a617cf Add test for Jira NCF-249 2013-04-23 21:06:14 +00:00
Dennis Heimbigner
7e8bfb01f3 Fix jira NCF-249 2013-04-23 20:18:16 +00:00
Dennis Heimbigner
b5697ae20f Rebuild the projection merging code 2013-04-17 18:58:37 +00:00
Ward Fisher
9f187a1484 Merged the fix for NCF-29 from Quincy into the trunk. 2013-03-26 18:57:26 +00:00
Dennis Heimbigner
ab17dded89 Caron says to use thredds-test
as the default test server.
2013-03-25 18:01:32 +00:00
Dennis Heimbigner
b15a7b1191 Make some initial changes to support move to thredds.ucar.edu 2013-03-25 17:44:08 +00:00
Dennis Heimbigner
1abb2ecb56 Fix jira NCF-243
Problem was that the NC_create
code was not checking for the NC_CLASSIC_MODEL
mode flag in deciding what dispatch table to use.
This meant that it was then defaulting to use
the default format, and if that was changed
to e.g. NC_FORMAT_NETCDF4, then it would try
to create a netcdf-4 format file, even is
NC_CLASSIC_MODEL mode flag was set.
2013-03-15 20:03:59 +00:00
Dennis Heimbigner
d70cf6d10c Primary change is to add ability
to do prefetch on either a lazy
or eager basis. Lazy means that
the prefetch does not occur
until and unless the client actually
makes a get_var request.

Also repaired a problem where
doing prefetch wrt a url that
has a constraint will prefetch
a whole variable if its constrained
size is small enough, even if the
underlying variable is too large
to warrant prefetch.
2013-03-03 04:06:43 +00:00
Dennis Heimbigner
6cf31dcf2d jira: NCF-232: bad conversion of grids 2013-02-26 04:31:06 +00:00
Ward Fisher
ddf3c31bb0 Corrected a handful of syntax issues in CMake config files,
probably introduced more.  

Added CMake-related files to Makefile.am files for inclusion
when creating a distribution package.
2013-02-20 23:28:28 +00:00
Dennis Heimbigner
ccb523fb56 add fix for '/' in dap names plus test 2013-02-04 18:49:48 +00:00
Dennis Heimbigner
6480ea723d fix missing decl bug in test_cvt.c; not sure why it is being exercised 2012-12-10 18:28:56 +00:00
Dennis Heimbigner
6bed1e932e fix previous change to ensure proper return code 2012-12-07 02:25:57 +00:00
Dennis Heimbigner
0803ba20ba fix Jira NCF-208; but note that this causes test.06 to fail because thredds mishandles grids 2012-11-21 23:57:42 +00:00
Dennis Heimbigner
047967515a fix tests to work with non-escaped % 2012-11-19 20:59:43 +00:00
Ward Fisher
7a226dd3f1 Merging the win_netcdf branch into the trunk. 2012-09-27 22:50:41 +00:00
Ward Fisher
34efd517f9 2012-09-21 17:37:57 +00:00
Ward Fisher
814f97e5cf Rolled back a change in t_dap3a.c related to determining local path. 2012-09-04 22:51:49 +00:00
Ward Fisher
0b7a0778fe 2012-09-04 19:48:26 +00:00
Ward Fisher
31cfdd5910 Added 'examples' directory to CMake 2012-08-28 22:31:07 +00:00
Ward Fisher
9e2c434851 Fixed a couple ncdap tests when running on Windows. 2012-08-27 18:38:47 +00:00
Ward Fisher
0b702c3ce2 Modified tests to determine location dynamically instead of from an environmental variable. 2012-08-21 22:52:40 +00:00
Ward Fisher
d86b1720ea 2012-08-21 21:36:09 +00:00
Ward Fisher
58035ff8f2 Added new tests, CMake functionality. 2012-08-21 20:08:53 +00:00
Dennis Heimbigner
9e8146f873 fix jira NCF-192/e-support VFZ-479321: name conflict under AIX6.1 2012-08-16 17:43:16 +00:00
Dennis Heimbigner
256a2d94bd fix jira NCF-191 reported by Manke 2012-08-15 21:13:44 +00:00
Dennis Heimbigner
42999f4c7c move from oc1.0 to oc2.0; create new dir oc2 2012-07-31 20:34:13 +00:00
Dennis Heimbigner
b083b9e758 fix == in shell scripts 2012-07-17 20:13:17 +00:00
Dennis Heimbigner
5ecd5854a9 fix server ping in test_varm3 2012-07-16 20:34:31 +00:00
Dennis Heimbigner
289d381dc6 fix test_varm3 to use new server ping facility 2012-07-16 19:57:58 +00:00
Dennis Heimbigner
1041a4c25b add procedure and program to locate a working dts test server 2012-06-22 21:54:52 +00:00
Ward Fisher
151bcf6690 Corrected several 'srcpath' related issues introduced when the windows
netcdf branch was merged into the trunk.  'make distcheck' should work now.
2012-06-14 17:24:55 +00:00
Ward Fisher
9cdfc2fdfe For the short term, removed a handful of tests from running
on windows.  The reported failures are not true failures.
2012-06-12 22:04:40 +00:00
Ward Fisher
540b721f21 o Corrected ncdap_test scripts to modify the path on windows systems using MinGW. 2012-06-06 21:57:29 +00:00
Dennis Heimbigner
5b2aee44a7 windows support fixes plus add --disable-diskless 2012-05-15 17:48:27 +00:00
Dennis Heimbigner
79c751b806 catch some distclean files 2012-05-13 18:42:10 +00:00
Dennis Heimbigner
00e50f5a44 1. changed from using port 8080 to 8081 for motherlode
2. Fixed Ward's IGNORE problem with oc
3. Mmap support now works.
4. Fix an uninitialized variable pointed out by Russ in dnclog.c
2012-04-22 20:34:21 +00:00
Dennis Heimbigner
5536bccee1 allow NC_DISKLESS with nc_open() to operate as a in-memory cache 2012-04-08 22:47:38 +00:00
Dennis Heimbigner
a4e030f4cc remove debug flag 2012-03-16 20:01:09 +00:00
Dennis Heimbigner
54b345fc6c change test_partvar source to avoid server error 2012-03-15 22:01:34 +00:00
Dennis Heimbigner
99eef24bc2 - Fix NCF-158 to modify ncgen flag defaults.
- Fix NCF-157 to modify DAP code to support
  partial variable retrieval.
- Fix of NCF-154 to solve problem of ncgen
  improperly processing data lists for variables
  of size greater than 2**18 bytes.
- Fix ncgen processing of char variables that have
  multiple unlimited dimensions.
- Partly fix Jira issue: NCF-145 (vlen issues).
- Benchmark program nc_test4/tst_ar4_*) requires arguments
  and should only be invoked inside a shell
  script; fixed so that they terminate cleanly
  if invoked with no arguments.
- Fix the Doxygen processing so it will work
  with make distcheck.
- Begin switchover to using an alternative to ncio.
- Begin support for in-memory (diskless) files.
2012-03-14 23:26:48 +00:00
Dennis Heimbigner
513b094561 add some debugging output 2012-02-08 21:45:28 +00:00
Dennis Heimbigner
3e592a2604 fix dap string handling 2012-02-03 21:31:50 +00:00
Dennis Heimbigner
6cf62a5add turn off bad test 2012-01-30 16:49:40 +00:00
Dennis Heimbigner
f23cc01112 Add Surface_METAR_20120101_0000.nc test 2012-01-30 05:43:29 +00:00
Dennis Heimbigner
1e1907e393 fix a bug in libdap2 handling of strings 2012-01-30 04:32:12 +00:00
Dennis Heimbigner
aebd11348a 1)Integrate the oc with improved performance 2012-01-29 18:56:29 +00:00
Dennis Heimbigner
8b3b307b10 modify dap legal names 2011-12-05 20:53:43 +00:00
Dennis Heimbigner
efd9808b0a completely rewritten constraint system 2011-11-14 04:20:19 +00:00
Dennis Heimbigner
d10a2605ce moved librpc/ from major branch to trunk 2011-10-23 20:17:56 +00:00
Dennis Heimbigner
1c7fb2fdb7 shutdown ncdap_test temporarily 2011-10-09 03:41:37 +00:00
Dennis Heimbigner
6d84f1c20a shutoff possibly offending test 2011-10-06 20:04:06 +00:00
Dennis Heimbigner
16dee702b7 fix NCF-120 2011-09-15 16:57:16 +00:00
Dennis Heimbigner
f10d6256b1 prepare for new escape rules 2011-07-17 19:17:04 +00:00
Dennis Heimbigner
3df9918cbc fixed escape handling for names 2011-05-27 18:57:35 +00:00
Ed Hartnett
e2685a1475 changes to remove EXTERN_LDFLAG from build, also to fix netCDF-4 sync bug 2011-05-17 19:14:35 +00:00
Dennis Heimbigner
fec4cdb230 Fixed the following Jira minor bugs:
NCF-42: _Format attribute sometimes being ignored
NCF-43: Fixed unsigned long long parsing.
NCF-47: Make opendap code properly handle illegal names like "x.y" by
        supressing them
NCF-49: check for uint type
NCF-50: properly handle username:pwd embedded in urls.
2011-05-12 17:51:32 +00:00
Dennis Heimbigner
54d7ae4073 Add new test_vara test to check for correct slicing by dap 2011-01-24 21:32:21 +00:00
Dennis Heimbigner
c3e9873c3e Fix libdispatch/dispatch.c URL testing 2011-01-20 21:45:29 +00:00
Dennis Heimbigner
9778f96dd0 Fixed nc_get_vara index >0 problem (H/T Jeff Whitaker) 2011-01-18 21:14:06 +00:00
Dennis Heimbigner
209742ebec Fixed dap memory leaks 2010-12-17 23:54:09 +00:00
Dennis Heimbigner
f7e41dde66 add cdmremote skeleton code 2010-12-15 21:45:05 +00:00
Dennis Heimbigner
cba787cfff Fixed bug in libcndap about handling nested sequences 2010-12-03 22:01:21 +00:00
Dennis Heimbigner
d6741c826a Fixed some constraint handling bugs 2010-11-13 23:24:28 +00:00
Dennis Heimbigner
b928a38cd5 Fixed bug in relational constraints; added tests 2010-10-14 22:34:52 +00:00
Dennis Heimbigner
c9a566a42c rebuilt the handling of character datalists to support unlimiteds properly 2010-07-29 20:37:05 +00:00
Dennis Heimbigner
73bf240f07 insert ESG support 2010-07-19 18:06:09 +00:00
Ed Hartnett
2ce4c3e368 removed unneeded files from repository 2010-06-29 14:22:30 +00:00
Ed Hartnett
f0a72cbefb fixed broken classic-only build 2010-06-28 17:17:43 +00:00
Russ Rew
8a013d4f51 Changed calls in tests from deprecated _ubyte functions to equivalent
_uchar functions.
2010-06-22 22:41:04 +00:00
Ed Hartnett
92ccf1c5fa moved headers to include directory 2010-06-03 20:22:55 +00:00
Ed Hartnett
18f4bca367 moving to trunk subdir 2010-06-03 13:24:43 +00:00