Commit Graph

7643 Commits

Author SHA1 Message Date
Ward Fisher
d58a21cb5f Removed dangling conflict info. 2020-12-07 12:18:30 -07:00
Ward Fisher
878866c039 Merge branch 'ncgenkw.dmh' of https://github.com/DennisHeimbigner/netcdf-c into gh1753.wif 2020-12-07 11:29:12 -07:00
Ward Fisher
e2e6f5f94b
Merge pull request #1903 from Unidata/gh1902.wif
PR #1902 + Github Actions
2020-12-07 11:21:40 -07:00
Ward Fisher
5fed325180 Cleaned up orphaned github action files, modified GA to run on PR instead of push. 2020-12-07 11:16:04 -07:00
Dennis Heimbigner
90fd1406bc Make use of clock_gettime be conditional.
Re: GH Issue https://github.com/Unidata/netcdf-c/issues/1900

Apparently the clock_gettime() function is not always available.
It is used in unit_test/tst_exhash.c and unit_test/tst_xcache.c.

To solve this, a number of things were changed:
* Move the timing code to a new file unit_tests/timer_utils.[ch]
* Modify the timing code to choose one of several timing methods
depending on availability. The prioritized order is as follows:
    1. If Windows, use the QueryPerformanceCounter mechanism else
    2. Use clock_gettime if available else
    3. Use gettimeofday if available else
    4. Use getrusage if available

Note that the resolution of 3 and 4 is less than 1 or 2.

Misc. Other Changes:
* Move the test in CMakeLists.txt that disables unit tests for WIN32 to unit_test/CMakeLists.txt since some unit tests actually work under Visual Studio.
* Fix some of the unit tests to work under visual studio
* Fix problem with using remove() in zmap_nzf.c
* Remove some warning about use of EXTERNL
2020-12-06 18:19:53 -07:00
Dennis Heimbigner
731d9bbb0b Merge remote-tracking branch 'Unidata/master' 2020-12-05 12:59:34 -07:00
Ward Fisher
4cf290dc0b
Merge pull request #1897 from DennisHeimbigner/oceanunavail.dmh
Disable use of opendap2.oceanbrowser.net
2020-12-04 16:11:47 -07:00
Ward Fisher
8caa2aa640
Merge pull request #1901 from Unidata/add-github-actions.wif
Add GitHub actions.wif
2020-12-04 16:11:25 -07:00
Ward Fisher
bfa8fde35e Temporarily disabled encoding test under cmake 2020-12-04 15:49:30 -07:00
Ward Fisher
7fce4b3482 Clean up, bring over a new action script. This one uses apt and cached builds instead of conda. 2020-12-04 15:38:13 -07:00
Ward Fisher
1814da1f7f Temporarily reducing test matrix. 2020-12-03 12:20:52 -07:00
Ward Fisher
04640abe32 Github Action debugging. 2020-12-03 12:12:07 -07:00
Ward Fisher
9b9ca97712 Explicitly link rt library for github actions. 2020-12-03 12:09:24 -07:00
Ward Fisher
d263a48637 Correct previous 'fix' that wasn't. 2020-12-03 12:03:34 -07:00
Ward Fisher
f48ccb465d Address link issue on github actions platform. 2020-12-03 11:59:25 -07:00
Ward Fisher
11bf6e81ca Merge branch 'master' into add-github-actions.wif 2020-12-03 11:40:40 -07:00
Dennis Heimbigner
2c71bf5d06 Merge remote-tracking branch 'Unidata/master' 2020-12-03 11:39:17 -07:00
Ward Fisher
74fbad49ea
Merge pull request #1895 from DennisHeimbigner/mergeerr.dmh
Fix merge error from previous PR
2020-12-03 11:13:17 -07:00
Dennis Heimbigner
4126ca218a unblock dmh appveyor 2020-12-02 18:17:07 -07:00
Dennis Heimbigner
bbb62e697a unblock .dmh 2020-12-02 16:51:14 -07:00
Dennis Heimbigner
c797eb29ad remove worflows and fix ifdef 2020-12-02 16:36:09 -07:00
Dennis Heimbigner
6f72cec65e opendap2.oceanbrowser.net is temporarily unavailable 2020-12-02 11:18:54 -07:00
Dennis Heimbigner
4a5e228bfd update file permission 2020-12-01 22:17:07 -07:00
Dennis Heimbigner
af89295852 ignore 2020-12-01 22:09:13 -07:00
Dennis Heimbigner
5b8842b373
manual.yml 2020-12-01 22:06:16 -07:00
Dennis Heimbigner
62036cbf45
ignore.yml 2020-12-01 22:01:44 -07:00
Dennis Heimbigner
8cf8c31df4
automake-dmh.yml 2020-12-01 21:59:52 -07:00
Dennis Heimbigner
c164650cb6 rename 2020-12-01 21:58:10 -07:00
Dennis Heimbigner
6cdddd7596 update workflows 2020-12-01 21:53:33 -07:00
Dennis Heimbigner
0aa80f91d6 manual workflow 2020-12-01 21:48:39 -07:00
Dennis Heimbigner
3b704d0635 Fix minor Makefile.am warning 2020-12-01 20:26:34 -07:00
Dennis Heimbigner
e1c470683c Fix merge error from PR https://github.com/Unidata/netcdf-c/pull/1892/files 2020-12-01 20:10:48 -07:00
Ward Fisher
c96722e001
Merge pull request #1890 from gsjaardema/patch-46
Fix undefined struct member access
2020-12-01 14:41:27 -07:00
Ward Fisher
9aef2dd70c Merge branch 'master' into add-github-actions.wif 2020-11-30 11:52:04 -07:00
Ward Fisher
3953fc2d8d
Merge pull request #1892 from DennisHeimbigner/httpfield.dmh
Enforce that !ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3
2020-11-30 11:48:28 -07:00
Ward Fisher
1bc580d737
Merge pull request #1891 from DennisHeimbigner/revertbm.dmh
Remove some file references in nczarr_test/Makefile.am
2020-11-30 11:48:18 -07:00
Ward Fisher
1ba45b9e9a Adding github actions to netcdf-c for CI purposes. 2020-11-30 11:21:51 -07:00
Dennis Heimbigner
68bcd1122a Enforce that !ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3
This is a follow on to PR https://github.com/Unidata/netcdf-c/pull/1890

Modify configure.ac to enforce that
!ENABLE_BYTERANGE => !ENABLE_HDF5_ROS3
2020-11-28 13:00:06 -07:00
Dennis Heimbigner
553f519176 remove actions file 2020-11-27 14:09:08 -07:00
Dennis Heimbigner
ed590d4076 remove actions file 2020-11-27 14:08:16 -07:00
Dennis Heimbigner
33154873e6 Remove some file references in nczarr_test/Makefile.am
Some file references in nczarr_test/Makefile.am
were included accidentally. So revert by removing those references.
2020-11-27 13:59:39 -07:00
Dennis Heimbigner
2be30b120e revert 2020-11-27 13:55:53 -07:00
Dennis Heimbigner
0135aa6318 remove nczarr_test/bm* 2020-11-27 13:33:19 -07:00
Dennis Heimbigner
6a6ff29059 remove bm_chunks3 2020-11-27 13:12:08 -07:00
Dennis Heimbigner
5550aea120 actions1 2020-11-26 13:48:22 -07:00
Dennis Heimbigner
c5d72067d7
Create c-cpp.yml 2020-11-26 13:37:00 -07:00
Greg Sjaardema
db0b84252c
Fix undefined struct member access
The `http` field of the hdf5 info struct is not defined unless `ENABLE_HDF5_ROS3` or `ENABLE_BYTERANGE` or `ENABLE_S3_SDK` is defined.  Based on a quick look at the code, I think that the `ENABLE_HDF5_ROS3` define is the relavant one here.  Maybe a better fix is to check if any of them are defined...
2020-11-24 08:25:29 -07:00
Ward Fisher
32b85d210b
Merge pull request #1887 from DennisHeimbigner/nczarr_cache.dmh
Provide a Number of fixes/improvements to NCZarr
2020-11-20 15:29:32 -07:00
Dennis Heimbigner
be6cefc708 missing ifdef 2020-11-20 13:11:34 -07:00
Dennis Heimbigner
c25ebd7787 Fix a number of CMake problems 2020-11-19 22:24:13 -07:00