Commit Graph

7908 Commits

Author SHA1 Message Date
Greg Sjaardema
31f0c80ade
Remove a debug print 2021-06-02 12:55:36 -06:00
Greg Sjaardema
477c4de95b
Clean up curl symbol tests
* Set `CMAKE_REQUIRED_INCLUDES` to include the path found for `curl.h`.  The `CHECK_C_SOURCE_COMPILES` function uses this and not the `INCLUDE_DIRECTORIES`

* Make the test for version 7.66 or later match the same test in `configure.ac`
* If the version is 7.66 or later, then we can skip the tests for the curl symbols which were all added in versions prior to 7.66.
* If the version is earlier than 7.66, then continue to perform the tests.
2021-06-02 12:54:05 -06:00
Ward Fisher
94262989eb
Merge pull request #1991 from gsjaardema/eliminate_need_for_hdf5-1.6-API
Remove need for HDF5-1.6 API being defined
2021-06-01 16:36:28 -06:00
Ward Fisher
384e77d9fe
Merge pull request #2012 from DennisHeimbigner/dimscope.dmh
Regularize the scoping of dimensions
2021-06-01 16:28:12 -06:00
Ward Fisher
7446311dfd
Merge pull request #2014 from Unidata/fix-makedist.wif
Another PR to fix 'make distcheck' issues that had crept in.
2021-06-01 15:26:23 -06:00
Ward Fisher
cab3743568 Added missing file. 2021-06-01 15:05:42 -06:00
Ward Fisher
c41f7943cb
Merge branch 'master' into dimscope.dmh 2021-06-01 14:12:04 -06:00
Ward Fisher
a1f8145038
Merge pull request #2011 from DennisHeimbigner/authfix.dmh
Re-enable DAP2 authorization tests
2021-06-01 14:09:50 -06:00
Ward Fisher
b0f85f41df
Merge branch 'master' into authfix.dmh 2021-06-01 14:09:43 -06:00
Ward Fisher
bc98720e3c Merge branch 'master' into fix-makedist.wif 2021-06-01 13:55:30 -06:00
Ward Fisher
64fa63a774 Clean up stray file that was fouling make distcheck 2021-06-01 13:55:10 -06:00
Ward Fisher
82271ff612
Merge pull request #1998 from DennisHeimbigner/mktmp.dmh
Fix bug with windows version of mkstemp that causes failure to create more than 26 temp files
2021-06-01 12:58:23 -06:00
Dennis Heimbigner
cfa935967f Fix conflicts 2021-06-01 12:45:30 -06:00
Dennis Heimbigner
412e4078d8 Revert action triggers 2021-05-31 16:06:17 -06:00
Dennis Heimbigner
c707d1d413 Update Release Notes 2021-05-31 15:54:11 -06:00
Dennis Heimbigner
ec5b3f9a4f Regularize the scoping of dimensions
This is a follow-on to pull request
````https://github.com/Unidata/netcdf-c/pull/1959````,
which fixed up type scoping.

The primary changes are to _nc\_inq\_dimid()_ and to ncdump.

The _nc\_inq\_dimid()_ function is supposed to allow the name to be
and FQN, but this apparently never got implemented. So if was modified
to support FQNs.

The ncdump program is supposed to output fully qualified dimension names
in its generated CDL file under certain conditions.

Suppose ncdump has a netcdf-4 file F with variable V, and V's parent group
is G. For each dimension id D referenced by V, ncdump needs to determine
whether to print its name as a simple name or as a fully qualified name (FQN).

The algorithm is as follows:

1. Search up the tree of ancestor groups.
2. If one of those ancestor groups contains the dimid, then call it dimgrp.
3. If one of those ancestor groups contains a dim with the same name as the dimid, but with a different dimid, then record that as duplicate=true.
4. If dimgrp is defined and duplicate == false, then we do not need an fqn.
5. If dimgrp is defined and duplicate == true, then we do need an fqn to avoid incorrectly using the duplicate.
6. If dimgrp is undefined, then do a preorder breadth-first search of all the groups looking for the dimid.
7. If found, then use the fqn of the first found such dimension location.
8. If not found, then fail.

Test case ncdump/test_scope.sh was modified to test the proper
operation of ncdump and _nc\_inq\_dimid()_.

Misc. Other Changes:
* Fix nc_inq_ncid (NC4_inq_ncid actually) to return root group id if the name argument is NULL.
* Modify _ncdump/printfqn_ to print out a dimid FQN; this supports verification that the resulting .nc files were properly created.
2021-05-31 15:51:12 -06:00
Dennis Heimbigner
069a542725 Add backslash escape option to pathcvt and test 2021-05-30 16:16:25 -06:00
Dennis Heimbigner
a99afdefc6 Add backslash escape option to pathcvt and test 2021-05-30 16:12:40 -06:00
Dennis Heimbigner
1bb482dbae Update RELEASE NOTES 2021-05-29 21:57:06 -06:00
Dennis Heimbigner
e632d02041 Re-enable DAP2 authorization tests
The thredds-test server now has some password protected datasets
that can be used to test DAP2 authorization support.
The general location is
````
https://thredds.ucar.edu/thredds/tdscapabilities/authTest.html
````
and specifically:
````
https://thredds.ucar.edu/thredds/dodsC/test3/testData.nc.html
````

This PR replaces old testcases with ncdap_test/testauth.sh.
This testcase allows us to test use of the .dodsrc file and .netrc file
and embedded user+pwd.

As part of this, I had to create a program (ncdap_test/pathcvt.c)
that is essentially the equivalent to cygpath. Given a path in
windows, unix, msys or cygwin format, it converts it to the
equivalent format in one of those four cases.  So it can be used
to convert a cygwin path to a windows path, for example. This is
needed in testpathcvt and testauth to make sure that the paths
in .daprc (e.g. the reference to .netrc) are of the proper
format.

Misc. Other Changes:
1. Fix some memory leaks in libdap2
2. Setting the env variable CURLOPT_VERBOSE allows tracking of curl
   operations.
3. Make tst_charvlenbug be conditional on NC_VLEN_NOTEST.
2021-05-29 21:30:33 -06:00
Dennis Heimbigner
3c5740dde5 sigh 2021-05-29 21:17:52 -06:00
Dennis Heimbigner
fe16d0884f final 2021-05-29 20:51:09 -06:00
Dennis Heimbigner
67df42a536 converted 2021-05-29 19:50:41 -06:00
Dennis Heimbigner
b95d2302b5 pathcvtadd 2021-05-29 17:14:16 -06:00
Dennis Heimbigner
2cb7f4768b pathcvt 2021-05-29 16:52:41 -06:00
Dennis Heimbigner
c361c1056d update file permission 2021-05-29 16:40:38 -06:00
Dennis Heimbigner
42a9360f9a charvlen 2021-05-28 21:53:12 -06:00
Dennis Heimbigner
74793520b2 szip 2021-05-28 14:27:22 -06:00
Dennis Heimbigner
571c9b4323 merge 2021-05-28 13:09:16 -06:00
Greg Sjaardema
e2d0bbb8ea
Merge branch 'master' into eliminate_need_for_hdf5-1.6-API 2021-05-28 07:11:13 -06:00
Ward Fisher
b8e9929e34
Merge pull request #1986 from DennisHeimbigner/ncdumpvlenbug.dmh
Fix ncdump bug when printing VLENs with basetype char
2021-05-27 15:13:50 -06:00
Ward Fisher
19809e2c26
Merge branch 'master' into ncdumpvlenbug.dmh 2021-05-27 14:50:05 -06:00
Ward Fisher
3d997de7d3
Merge pull request #1959 from DennisHeimbigner/typescope.dmh
Regularize the scoping of types
2021-05-27 14:34:05 -06:00
Ward Fisher
2c26f94a49
Merge branch 'master' into typescope.dmh 2021-05-27 14:13:14 -06:00
Ward Fisher
73e7b84294
Merge pull request #2009 from DennisHeimbigner/xgetoptmingw.dmh
Fix Mingw versus XGetopt (again)
2021-05-27 14:07:30 -06:00
Ward Fisher
e0ddc7c4e0
Merge branch 'master' into xgetoptmingw.dmh 2021-05-27 14:07:18 -06:00
Ward Fisher
991069ea93
Merge pull request #1973 from gsjaardema/patch-48
Fix some HDF5-related tests
2021-05-27 12:31:30 -06:00
Ward Fisher
1eb7522528
Merge pull request #2000 from DennisHeimbigner/badfilter.dmh
Improve error message when non-existent filter is encountered.
2021-05-27 12:30:44 -06:00
Ward Fisher
cc618af959
Merge branch 'master' into badfilter.dmh 2021-05-27 12:30:39 -06:00
Ward Fisher
ca9be04be0
Merge pull request #2007 from Unidata/fix-makedist.wif
Makedist is failing in nczarr_test
2021-05-27 09:11:58 -06:00
Dennis Heimbigner
014db82bd4 Update Release notes 2021-05-26 16:06:17 -06:00
Dennis Heimbigner
d3f6c126b6 Fix Mingw versus XGetopt (again)
re: https://github.com/Unidata/netcdf-c/pull/2003#issuecomment-847637871

Turns out that mingw defines both _WIN32 and also defines getopt.
This means that this test:
````
#ifdef _WIN32
#include "XGetopt.h"
#endif
````
fails on this error:
````
../include/XGetopt.h:38:24: error: conflicting types for 'getopt'
````

Fix is to replace
````
#ifdef _WIN32
with
#if defined(_WIN32) && !defined(__MINGW32__)
````
2021-05-26 14:27:27 -06:00
Ward Fisher
5b49ee9f3b Temporarily remove distcheck from Github Actions 2021-05-26 13:55:59 -06:00
Ward Fisher
6eaf39f3c3 Revert previous change. 2021-05-26 13:54:40 -06:00
Ward Fisher
a5d7277092 Testing a different theory 2021-05-26 13:44:56 -06:00
Ward Fisher
5f95b7ca9f Temporarily add an ssh-interface when make distcheck fails. 2021-05-26 13:15:12 -06:00
Ward Fisher
ceb9b29e17 Speculating on fix, perhaps a race issue on make distcheck when passed the command to use concurrent processes. 2021-05-26 11:16:22 -06:00
Ward Fisher
141446514b Trying to fix a confounding error in make distcheck. 2021-05-26 11:03:29 -06:00
Ward Fisher
e2eb7bb52e Added DISTCHECK_CONFIGURE_FLAGS to Github Actions distcheck stanza. 2021-05-26 10:44:07 -06:00
Ward Fisher
d003f98367 Updated github actions to add make distcheck 2021-05-25 10:55:14 -06:00