Commit Graph

9046 Commits

Author SHA1 Message Date
Dennis Heimbigner
835b81a285 Cleanup DAP4 testing
NOTE: This PR should not be included in 4.9.1 since additional
DAP4 related PRs will be forthcoming.

This PR makes major changes to libdap4 and dap4_test driven by changes to TDS.

* Enable DAP4
* Clean up the test input files and the test baseline comparison files. This entails:
    * Remove a multitude of unused test input and baseline data files; among them are dap4_test/: daptestfiles, dmrtestfiles, nctestfiles, and misctestfiles.
    * Define a canonical set of test input files and record in dap4_test/cdltestfiles.
    * Use the cdltestfiles to generate the .nc test inputs. This set of .nc files is then moved to the d4ts (DAP4 test server) war file in the tds repository. This set then becomes the canonical set of DAP4 test sources.
    * Scrape d4ts to obtain copies of the raw streams of DAP4 encoded data. The .dmr and .dap streams are then stored in dap4_test/rawtestfiles.
    * Disable some remote server tests until those servers are fixed.
* Add an option to ncdump (-XF) that forces the type of the _FillValue attribute; this is primarily to simplify testing of fill mismatch.
* Minor bug fixes to ncgen.
* Changes to libdap4:
    * Replace old checksum hack with the dap4.checksum flag.
    * Support the dap4.XXX controls.
    * Cleanup _FillValue handling, especially var-attribute type mismatches.
    * Fix enum handling based on changes to netcdf-java.
* Changes to dap4_test:
    * Add getopt support to various test support programs.
    * Remove unneeded shell scripts.
    * Add new scripts: test_curlopt.sh
2022-11-13 13:15:11 -07:00
Ward Fisher
06df257e22
Merge pull request #2553 from WardF/fix_dap4_ac.wif
Make dap4 reference dap instead of hard-wired to be disabled.
2022-11-11 11:22:29 -07:00
Ward Fisher
37917f0d39 Make dap4 reference dap instead of hard-wired to be disabled. 2022-11-10 14:42:37 -07:00
Ward Fisher
cbad310d20
Merge pull request #2552 from DennisHeimbigner/racecond1.dmh
Fix race condition in ncdump (and other) tests.
2022-11-09 14:22:36 -07:00
Dennis Heimbigner
683d1ffea2 Update RELEASE_NOTES.md 2022-11-09 13:43:03 -07:00
Dennis Heimbigner
c60e11302e Merge branch 'racecond1.tmp' into racecond1.dmh 2022-11-09 13:38:14 -07:00
Dennis Heimbigner
e46b83a15a ckp 2022-11-09 13:37:40 -07:00
Dennis Heimbigner
1fd0bcc78b test4 2022-11-09 13:06:05 -07:00
Dennis Heimbigner
aa459e503f Restore DAP4 functionality and testing 2022-11-09 13:03:31 -07:00
Dennis Heimbigner
929ff0a56c test3 2022-11-09 12:59:46 -07:00
Dennis Heimbigner
2943a78ebb Merge main and fix conflicts 2022-11-09 12:58:40 -07:00
Ward Fisher
773745b1d0
Merge branch 'main' into racecond1.dmh 2022-11-09 12:58:10 -07:00
Dennis Heimbigner
6d009ea9b3 merged 2022-11-09 12:56:12 -07:00
Ward Fisher
87b50932de
Merge pull request #2530 from Unidata/v4.9.1-wellspring.wif
Merge subset of v4.9.1 files back into main development branch
2022-11-09 12:44:18 -07:00
Dennis Heimbigner
03b0e277d2 Update RELEASE notes 2022-11-08 20:18:12 -07:00
Dennis Heimbigner
9f848c9e53 Fix race condition in ncdump (and other) tests.
re: Issue https://github.com/Unidata/netcdf-c/issues/2551

Ryan May identified the use of a common scratch file (tmp.cdl)
across multiple test shell scripts in ncdump directory
and the nczarr_test directory.
This sometimes causes errors because of race conditions
between those scripts.

I renamed those common files to avoid the race condition.  I
also did some further checking and found some additional,
similar conflicts and fixed those. Also did some minor cleanup
of unused files.

Tests fixed:
ncdump: run_back_comp_tests.sh tst_bom.sh tst_nccopy4.sh tst_nccopy5.sh
nczarr_test: git df master -- run_nccopyz.sh run_nczarr_fill.sh run_scalar.sh
2022-11-08 20:12:38 -07:00
Dennis Heimbigner
71815264d9 merged 2022-11-08 20:09:27 -07:00
Dennis Heimbigner
7f98d4d7df Merge branch 'master' into racecond1.tmp 2022-11-08 20:07:38 -07:00
Dennis Heimbigner
d1d0ceaecf test2 2022-11-08 19:06:24 -07:00
Dennis Heimbigner
6d4ecf2f76 test 2022-11-08 16:56:51 -07:00
Ward Fisher
e57e742d30
Merge pull request #2529 from DWesl/cygwin-ci-no-install-plugins
Add Cygwin CI and stop installing unwanted plugins
2022-11-08 13:45:02 -07:00
Dennis Heimbigner
2e92b40d42 test 2022-11-08 13:24:19 -07:00
Ward Fisher
3c8c8d6498 Merge branch 'main' into v4.9.1-wellspring.wif 2022-11-08 10:59:03 -07:00
Ward Fisher
7de5b8fcc7
Merge pull request #2550 from ibaned/strlen-ambiguous
Rename variable to avoid function name conflict
2022-11-08 10:39:32 -07:00
Dan Ibanez
6173956790 Rename variable to avoid function name conflict
I was getting the following error while compiling:

```
netcdf-c/libnczarr/zutil.c:544:26: error: called object 'strlen' is not a function or function pointer
  544 |     if(dnamep) *dnamep = strdup(dname);
      |                          ^~~~~~
netcdf-c/libnczarr/zutil.c:533:68: note: declared here
  533 | ncz_nctype2dtype(nc_type nctype, int endianness, int purezarr, int strlen, char** dnamep)
      |                                                                ~~~~^~~~~~
```

My interpretation is that strdup() is implemented as a macro
which calls strlen() the standard C function, and when that
macro is being substituted here the call to strlen tries
to "call" the integer variable named strlen.

Resolving this by renaming the integer variable to "len"
instead of "strlen", avoiding a conflict with a standard
C library function name.
2022-11-07 13:24:20 -07:00
DWesl
4c1a39bb71
BLD: Declare nulldup backup definition static not extern
The use of this function currently runs into problems with multiple definitions: once for each file including ncconfigure.h.  Defining this as static rather than extern should hide the definitions from each other.

static inline would still be closer to the definition as a macro, but that requires a #define to work on all platforms (not all compilers have inline yet).
2022-11-01 08:01:10 -04:00
DWesl
3b74e0bb93 FIX: ifndef requires no parentheses. 2022-10-29 13:27:17 -04:00
DWesl
4ef68740a3 STY: Move nulldup backup definition from cp_win32.c to ncconfigure.h
Allow definition to be used in more places.
Should probably consolidate definition a few places.
2022-10-29 09:48:22 -04:00
Ward Fisher
0f29b454d2
Merge pull request #2539 from wkliao/part
replace 4194304 with READ_BLOCK_SIZE
2022-10-28 15:50:58 -06:00
Ward Fisher
4a0725ae98
Merge pull request #2538 from wkliao/fix_text
typo fix
2022-10-27 15:25:02 -06:00
wkliao
e8cea27245 replace 4194304 with READ_BLOCK_SIZE 2022-10-27 15:33:38 -05:00
wkliao
a7a26081d4 typo fix 2022-10-27 15:25:25 -05:00
DWesl
fb02ff8ea8
BLD: Specify -avoid-version on MinGW and Cygwin; -version-info otherwise
Removing -avoid-version seems to have broken MinGW and Cygwin but fixed MacOS.  Hopefully this gets everything working.
2022-10-27 08:14:14 -04:00
Ward Fisher
e4ad39bd93 Merge branch 'main' into v4.9.1-wellspring.wif 2022-10-26 15:16:40 -06:00
Ward Fisher
0237d47708
Merge pull request #2537 from DennisHeimbigner/debugstmt.dmh
Turn off extraneous debug output
2022-10-26 15:16:08 -06:00
Dennis Heimbigner
6817decd29 Turn off extraneous debug output 2022-10-26 14:25:17 -06:00
Ward Fisher
3edcdc240b Correct a typo in support of https://github.com/Unidata/netcdf-c/issues/2534 2022-10-26 09:22:50 -06:00
Ward Fisher
83fca01a0a Updated the relees notes. 2022-10-20 14:10:27 -06:00
Ward Fisher
f2471be0bf
Merge pull request #2531 from WardF/filter_quickstart_guide.wif
Add draft filter quickstart guide
2022-10-19 12:59:08 -06:00
Ward Fisher
39aeb2f30d
Merge branch 'v4.9.1-wellspring.wif' into filter_quickstart_guide.wif 2022-10-19 12:23:40 -06:00
Ward Fisher
c4fd240f39 Updated RELEASE_NOTES 2022-10-19 12:22:38 -06:00
Ward Fisher
da03c01263 Correct an issue observed in out-of-source builds. 2022-10-19 10:26:44 -06:00
Ward Fisher
614c1f764b Working on another make distcheck failure. 2022-10-18 15:12:04 -06:00
Ward Fisher
533572f987 Correct an issue with 'make distcheck' where out-of-source tests were failing. 2022-10-18 14:27:12 -06:00
Ward Fisher
22da6b73c3 Add generated files to distclean. 2022-10-18 11:19:03 -06:00
Ward Fisher
dbfae7173b Update release notes. 2022-10-17 17:09:35 -06:00
Ward Fisher
b42ab34cec Copy zmap reference files for cmake-based tests. 2022-10-17 16:55:40 -06:00
Ward Fisher
85cfbab102 Manually bump version in diff-compare to get RC1 out the door, this will need to be automatically excluded from the test at some point otherwise we will see this test fail every time the VERSION string changes. 2022-10-17 14:20:34 -06:00
Ward Fisher
ccd1e6a633 Updated for next release cycle. 2022-10-17 13:34:11 -06:00
Ward Fisher
a0736a3f06 Updated SO version. 2022-10-17 13:31:39 -06:00