Commit Graph

379 Commits

Author SHA1 Message Date
Ward Fisher
0ef6f3415a Making tst_hdf4_read_var.sh dependent on tst_interops2. 2017-12-06 15:07:54 -07:00
Ed Hartnett
3c5404ccf7
Merge branch 'master' into ejh_ncfunc_testing 2017-11-28 00:04:38 +00:00
Ed Hartnett
ce97137318 removed properties from tst_interops3 which is no longer a test in CMake build 2017-11-26 09:07:34 -07:00
Ed Hartnett
bebe7e1e9d merged master 2017-11-26 07:06:02 -07:00
Nehal J Wani
1b91bd89d4
Fix build on pre-C99 compilers
- Make sure that the variables are declared at the top of the block.
 - Add fix to enable inline for various compilers
2017-11-26 01:47:54 +05:30
Ed Hartnett
8011fab382 now run tst_large2, also cleaned up some more warnings 2017-11-24 10:50:07 -07:00
Ed Hartnett
273b1d5bf9 merged ejh_check_test 2017-11-24 10:12:54 -07:00
Ed Hartnett
fa7f17a8c8 got cmake working with HDF4 format test 2017-11-24 06:05:55 -07:00
Ed Hartnett
b4bccb60b3 fixing test order problem 2017-11-23 07:18:12 -07:00
Ed Hartnett
60d1d6271d fixing order in CMake 2017-11-23 04:52:19 -07:00
Ed Hartnett
843db9798f finally got my distcheck act together by moving hdf4 file test to nc_test4 2017-11-23 04:41:03 -07:00
Ward Fisher
394ee6a1e0 Corrected typo, more enhancements in CMakeLists.txt 2017-11-22 13:34:56 -07:00
Ed Hartnett
3a48f59de3 removed legacy test that was no longer being run 2017-11-21 19:46:05 -07:00
Ed Hartnett
c8a2d53d34 fixes HDF4 build with cmake 2017-11-20 08:25:47 -07:00
Ed Hartnett
d7c1dd82c3 fixed hdf4 test that should not run if utilities not built 2017-11-18 07:36:24 -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
7a2d62afe4 merging branches into develop 2017-11-15 11:26:29 -07:00
Ed Hartnett
83c2395238 merging branches into develop 2017-11-15 11:25:42 -07:00
Ed Hartnett
2baf95e09d
Merge branch 'master' into ejh_turn_tests_on 2017-11-15 03:40:56 -07:00
Ed Hartnett
92a995e521
Merge branch 'master' into ejh_large_file_test_3 2017-11-15 03:39:42 -07:00
Ed Hartnett
0e58aa412d fixed memory leak in tst_filterparser 2017-11-14 09:05:35 -07:00
Ward Fisher
16d6f94f30 Merge branch 'master' into filters.dmh 2017-11-13 11:15:02 -07:00
Ed Hartnett
cb32451cf5 turned on some commented out test code 2017-11-10 05:01:32 -07:00
Ed Hartnett
df31f07830
Merge branch 'master' into ejh_make_j_3 2017-11-10 02:53:07 -07:00
Ward Fisher
a9dde277d7 Merge branch 'ejh_enum_mem_fix' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls 2017-11-09 16:11:17 -07:00
Ed Hartnett
e792d992b1 fixed names of output files to enable parallel builds 2017-11-09 07:21:00 -07:00
Ed Hartnett
b9911d6e6f took out most uses of EXTRA_TESTS, returned it to disabled by default 2017-11-08 13:25:23 -07:00
Ed Hartnett
6653eeaf7f
Merge branch 'master' into ejh_turn_tests_on 2017-11-07 18:35:16 -07:00
Ed Hartnett
a72d5b4d16
Merge branch 'master' into ejh_enum_mem_fix 2017-11-07 18:34:55 -07:00
Ward Fisher
e7fee3ee53 Corrected an issue encountered by the default compiler on ARM. 2017-11-07 15:19:07 -07:00
Ward Fisher
b92ae0cdbc Merge branch 'ejh_fix_use_cdf' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls 2017-11-07 14:14:10 -07:00
Ed Hartnett
c58bc3e41c fixed warnings 2017-11-06 06:06:47 -07:00
Ed Hartnett
7af77fd6a9
Merge branch 'master' into ejh_turn_tests_on 2017-11-05 10:09:08 -07:00
Ed Hartnett
6ce15853d6 fixed ENABLE_CDF5 issue in some tests 2017-11-05 09:06:48 -07:00
Ed Hartnett
7872785cf0
Merge branch 'master' into ejh_enum_mem_fix 2017-11-03 19:44:40 -06:00
Ward Fisher
f98635be1b Merge remote-tracking branch 'origin/h5offset.dmh' into dmh_multi_merge 2017-11-03 12:40:52 -06:00
Ed Hartnett
b257353b18 fixed commented out tests 2017-11-03 08:14:08 -06:00
Ed Hartnett
406e979fb4 fixed tst_enums memory issue 2017-11-01 04:31:12 -06:00
Ed Hartnett
86f35ea6db
Merge branch 'master' into ejh_more_mem_3 2017-10-30 07:34:52 -06:00
Dennis Heimbigner
2d77e6451b Master merge 2017-10-28 14:06:39 -06:00
Dennis Heimbigner
261ed4c99d Merge branch 'master' into h5offset.dmh 2017-10-27 12:33:17 -06:00
Ed Hartnett
9f72f5adf4 fixed memory error in tst_fills2.c 2017-10-27 06:26:36 -06:00
Ed Hartnett
22d3d152f0 removed tst_h_atts2.c 2017-10-26 04:55:30 -06:00
Ed Hartnett
30ef103a95 moved tests from tst_h_atts2 into tst_xplatform2 2017-10-26 04:49:57 -06:00
Ward Fisher
8e30bb9a1c Merge branch 'ejh_test_mem_leak' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into merge_small_pulls 2017-10-25 11:01:25 -06:00
Ward Fisher
fb38f81243 Merge branch 'ejh_ncdump' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into merge_small_pulls 2017-10-25 11:00:20 -06: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
Ed Hartnett
1e3831f98d fixed memory leak and warnings in test 2017-10-24 12:54:29 -06:00
Ed Hartnett
6363cae315 fixed warnings 2017-10-24 12:18:20 -06:00