Commit Graph

121 Commits

Author SHA1 Message Date
Ed Hartnett
bebe7e1e9d merged master 2017-11-26 07:06:02 -07:00
Ed Hartnett
f779345b23 eliminating test dependencies in ncdap_test 2017-11-26 07:00:17 -07:00
Ward Fisher
5163189f0c Merge branch 'cmake-parallel-testing' 2017-11-25 11:57:01 -07:00
Ed Hartnett
38b53c08ff cleaned up comments 2017-11-25 07:30:17 -07:00
Ed Hartnett
8d9e7b366d removed many dependencies in ncdump testing 2017-11-25 07:28:07 -07:00
Ed Hartnett
e064855a10 removed ncdump test dependencies for tst_netcdf4.sh 2017-11-25 04:31:58 -07:00
Ward Fisher
1ccdf0219f Work towards parallel testing via cmake. 2017-11-22 12:10:58 -07:00
Ed Hartnett
b04cf4f83b fixed dist list to include ref_null_byte_padding_test.nc 2017-11-21 17:19:42 -07:00
Ward Fisher
7d8f58a752
Merge branch 'master' into ejh_ncdump_3 2017-11-21 15:54:29 -07:00
Ward Fisher
cd3d5f8e0e Updated for expected failure. 2017-11-20 17:26:06 -07:00
Ward Fisher
a07eddd0e4 More wiring in of test. [ci skip] 2017-11-20 15:58:39 -07:00
Ward Fisher
01bfdbf767 Wired in test to autotools. 2017-11-20 15:06:10 -07:00
Ward Fisher
e8af76c2f4 Wiring in a quick test. 2017-11-20 13:52:06 -07:00
Ed Hartnett
87d59b80fb Makefile.am cleanup 2017-11-18 14:20:04 -07:00
Ed Hartnett
39916a105b added dependency 2017-11-18 09:28:25 -07:00
Ed Hartnett
9618937e69 cleanup of ncdump Makefile.am 2017-11-17 12:29:12 -07:00
Ed Hartnett
577ff47eff fixed dependency 2017-11-17 11:07:24 -07:00
Ed Hartnett
812c2fd4d1 got make -j check working in ncdump and examples directories 2017-11-17 10:16:17 -07:00
Ed Hartnett
4a4a4fb7a0 make -j working for classic only in ncdump 2017-11-17 08:22:49 -07:00
Ed Hartnett
693a47ad04 move C program invokations to scripts to clean up dependencies in build 2017-11-16 13:03:35 -07:00
Ed Hartnett
3b0c301d76 moved tst_bug324 in Cmake build from ncdump to nc_test4 2017-11-16 11:57:39 -07:00
Ed Hartnett
4f43b80320 moved test from ncdump to nc_test4 2017-11-16 11:30:35 -07:00
Ed Hartnett
8d583f94a0 removed last use of EXTRA_TESTS, also unneeded setting for tst_h_rdc0.c 2017-11-12 06:57:37 -07:00
Ed Hartnett
e9df3fad55 working on cmake build 2017-11-12 05:42:24 -07:00
Ed Hartnett
05d251bfb5 different attempt to deal with ncdump dependencies 2017-11-11 17:33:51 -07:00
Ed Hartnett
8df5c84f31 fixed makefile.am 2017-11-11 16:51:10 -07:00
Ed Hartnett
b17059e750 fixed makefile.am 2017-11-11 16:49:52 -07:00
Ed Hartnett
f709a7b107 another attempt at reducing ncdump dependencies 2017-11-11 16:45:03 -07:00
Dennis Heimbigner
9983b9d911 re e-support UBS-599337
re pull request https://github.com/Unidata/netcdf-c/pull/405
re pull request https://github.com/Unidata/netcdf-c/pull/446

Notes:
1. This branch is a cleanup of the magic.dmh branch.
2. magic.dmh was originally merged, but caused problems with parallel IO.
   It was re-issued as pull request https://github.com/Unidata/netcdf-c/pull/446.
3. This branch + pull request replace any previous pull requests and magic.dmh branch.

Given an otherwise valid netCDF file that has a corrupted header,
the netcdf library currently crashes. Instead, it should return
NC_ENOTNC.

Additionally, the NC_check_file_type code does not do the
forward search required by hdf5 files. It currently only looks
at file position 0 instead of 512, 1024, 2048,... Also, it turns
out that the HDF4 magic number is assumed to always be at the
beginning of the file (unlike HDF5).
The change is localized to libdispatch/dfile.c See
https://support.hdfgroup.org/release4/doc/DSpec_html/DS.pdf

Also, it turns out that the code in NC_check_file_type is duplicated
(mostly) in the function libsrc4/nc4file.c#nc_check_for_hdf.

This branch does the following.
1. Make NC_check_file_type return NC_ENOTNC instead of crashing.
2. Remove nc_check_for_hdf and centralize all file format checking
   NC_check_file_type.
3. Add proper forward search for HDF5 files (but not HDF4 files)
   to look for the magic number at offsets of 0, 512, 1024...
4. Add test tst_hdf5_offset.sh. This tests that hdf5 files with
   an offset are properly recognized. It does so by prefixing
   a legal file with some number of zero bytes: 512, 1024, etc.
5. Off-topic: Added -N flag to ncdump to force a specific output dataset name.
2017-10-24 16:25:09 -06:00
Ward Fisher
1ca5f8c993 Updated SO version, other little issue with ncdump Makefile.am. 2017-10-17 14:56:22 -06:00
Ward Fisher
e8cd6958a9 Merge branch 'v4.5.0-release-branch' into cal366.dmh 2017-10-09 14:08:21 -06:00
Ward Fisher
ef372357a0 Merge branch 'master' into cal366.dmh 2017-09-29 15:51:06 -06:00
Ward Fisher
37f89515b2 Updatec cleanfiles in makefile.am 2017-09-21 09:58:33 -06:00
Ward Fisher
11f235f86e Fixing more make distcheck errors. 2017-09-20 16:28:28 -06:00
Ward Fisher
10a9d6c4f8 Corrected another error. 2017-09-20 16:03:16 -06:00
Ward Fisher
05ddb3a953 Cleaning up 'make distcheck' 2017-09-20 15:59:24 -06:00
Ward Fisher
2151dbbd44 Giving test output netcdf files unique names. 2017-09-20 11:17:33 -06:00
Ward Fisher
e70fcc9865 Revert a previous change. 2017-09-15 16:29:11 -06:00
Ward Fisher
d048ccf583 Moved tst_inttags4.sh to only run if CDF5 is enabled. 2017-09-15 11:18:42 -06:00
Ward Fisher
eeeef6f2a6 Tweaking makefile.am 2017-09-05 13:05:01 -06:00
Ward Fisher
62511cc634 Removed a stray line in makefile.am 2017-09-01 13:03:49 -06:00
Ward Fisher
812a7b223d Wiring new test into autotools. 2017-09-01 11:57:28 -06:00
Dennis Heimbigner
0ccece70e8 Solve issue https://github.com/Unidata/netcdf-c/issues/359
from e-support OYW-455599.

Problem was that in nctime.c#CDMonthDay, it was setting up
the month -> #days table correctly, but it did not use it
because it forgot to check for Cd366, it only checked for Cd365.
2017-07-25 11:58:34 -06:00
Ward Fisher
02a6585eae Corrected some typos. 2017-05-24 15:49:18 -06:00
Ward Fisher
59ded4a82c Moving some tests around so that 'make check' works properly, in support of https://github.com/Unidata/netcdf-c/issues/339 2017-05-24 14:25:22 -06:00
Ward Fisher
8dddd222a3 Merged master, DAP4 support into branch. 2017-04-19 09:29:35 -06:00
Dennis Heimbigner
3db4f013bf Primary change: add dap4 support
Specific changes:
1. Add dap4 code: libdap4 and dap4_test.
   Note that until the d4ts server problem is solved, dap4 is turned off.
2. Modify various files to support dap4 flags:
	configure.ac, Makefile.am, CMakeLists.txt, etc.
3. Add nc_test/test_common.sh. This centralizes
   the handling of the locations of various
   things in the build tree: e.g. where is
   ncgen.exe located. See nc_test/test_common.sh
   for details.
4. Modify .sh files to use test_common.sh
5. Obsolete separate oc2 by moving it to be part of
   netcdf-c. This means replacing code with netcdf-c
   equivalents.
5. Add --with-testserver to configure.ac to allow
   override of the servers to be used for --enable-dap-remote-tests.
6. There were multiple versions of nctypealignment code. Try to
   centralize in libdispatch/doffset.c and include/ncoffsets.h
7. Add a unit test for the ncuri code because of its complexity.
8. Move the findserver code out of libdispatch and into
   a separate, self contained program in ncdap_test and dap4_test.
9. Move the dispatch header files (nc{3,4}dispatch.h) to
   .../include because they are now shared by modules.
10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts.
11. Make use of MREMAP if available
12. Misc. minor changes e.g.
	- #include <config.h> -> #include "config.h"
	- Add some no-install headers to /include
	- extern -> EXTERNL and vice versa as needed
	- misc header cleanup
	- clean up checking for misc. unix vs microsoft functions
13. Change copyright decls in some files to point to LICENSE file.
14. Add notes to RELEASENOTES.md
2017-03-08 17:01:10 -07:00
Wei-keng Liao
06c1f744e8 silence gcc compile warnings when using -Wconversion 2016-10-30 00:44:28 -05:00
Wei-keng Liao
4b911c1435 add a rule to delete folder results 2016-10-06 00:44:50 -05:00
Dennis Heimbigner
0cf1e2c49f re: Github issue netcdf-c 300
Modified provenance code to allocate the minimal space
needed for _NCProperties attribute in file.  Basically
required using malloc in the provenance code and in ncdump.
Otherwise should cause no externally visible effects.
Also removed the ENABLE_FILEINFO from configure.ac since
the provenance code is no longer optional.
2016-08-08 09:24:19 -06:00