Commit Graph

117 Commits

Author SHA1 Message Date
dmh
d2a832163b Make cmake run testauth.sh 2014-12-31 22:53:03 -07:00
dmh
e35a14a85d 1. synch with oc
2. modify oc2/ocrc.c rcfilenames to look for .ocrc before .dodsrc.
3. Modify testauth.sh to avoid using names that might already
   exist for cookies file and netrc file. Still must use .ocrc
   to test for local/home search.
4. Modify testauth.sh to save and restore any file it creates
   that already exists.
2014-12-31 22:29:36 -07:00
Ward Fisher
cdacc3a5f5 On some linux systems, the way functions were defined in the testurl shell script were not working. Modified the format of these scripts and it now appears to work, in some cases. Will push out to see if it works across the board, and will make further changes as need be. 2014-12-27 23:41:59 -07:00
dmh
20720199c8 1. synch with oc
2. fix ocuri parameter handling
3. add ncdap_test/testuri.sh to test parameter handling.
2014-12-27 20:42:01 -07:00
dmh
7a0a10ec7b add occurlfunctions.[ch] to the dist. 2014-12-26 12:27:54 -07:00
dmh
f423f27693 Sync with oc project.
This supports better authorization
handling for DAP requests, especially redirection
based authorization. I also added a new test case
ncdap_tests/testauth.sh.

Specifically, suppose I have a netrc file /tmp/netrc
containing this.
    machine uat.urs.earthdata.nasa.gov login xxxxxx password yyyyyy
Also suppose I have a .ocrc file containing these lines
    HTTP.COOKIEJAR=/tmp/cookies
    HTTP.NETRC=/tmp/netrc
Assume that .ocrc is in the local directory or HOME.

Then this command should work (assuming a valid login and password).
    ncdump -h "https://54.86.135.31/opendap/data/nc/fnoc1.nc"
2014-12-24 10:22:47 -07:00
dmh
7de1f7bef8 oc synch 2014-11-30 20:30:23 -07:00
dmh
1739c50622 Modified a number of tests
to make use of remotetest.unidata.ucar.edu
optional. Purpose is purely for testing
new dts and thredds servers.
2014-10-04 15:59:16 -06:00
Ward Fisher
b43813d821 When using the '-ansi' flag with gcc, netcdf would fail to build because of the use of '//' for one-line comments. I've addressed this by replacing instances of // with enclosing comment blocks. 2014-08-26 11:19:32 -06:00
dmh
7ea62784ce Added XFAIl redirect tesst to t_auth.c 2014-07-29 11:04:29 -06:00
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