Ward Fisher
f480dfd03a
Merge pull request #691 from nehaljwani/vc9
...
Code changes to make libnetcdf compile with vs2008
2017-11-27 16:42:37 -07:00
Ward Fisher
7796ecb196
Merge branch 'master' into vc9
2017-11-27 15:03:02 -07:00
Ward Fisher
9ba4ab6c2d
Merge pull request #683 from Unidata/strlcat1.dmh
...
Begin changing over to use strlcat instead of strncat
2017-11-27 15:01:02 -07:00
Ward Fisher
2bdc8a7855
Temporarily removed a test for Windows.
2017-11-27 11:58:27 -06:00
Ward Fisher
47f6a5589d
Merge branch 'master' into strlcat1.dmh
2017-11-27 10:32:24 -07: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
922734b88f
removed mention of deleted tst_h_rd_cmp.c from h5_test CMake build
2017-11-26 09:01:54 -07:00
Ed Hartnett
f33897e248
fixed some warnings, added some files to makefile.am to be cleaned
2017-11-26 08:50:16 -07:00
Ed Hartnett
0157c5660c
readded some cleanfiles to ncdump makefile
2017-11-26 07:15:17 -07:00
Ed Hartnett
6ebe58998f
clean up
2017-11-26 07:13:10 -07:00
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
Nehal J Wani
03dd4e260f
Make certain tests conditional on dependencies
...
tst_h_rdc0 depends on ncdump_tst_netcdf4, which isn't build if HAVE_BASH
isn't true. But CMake errors out with:
-- Bash shell not found; disabling shell script tests.
CMake Error at CMakeLists.txt:1521 (SET_PROPERTY):
SET_PROPERTY given TEST names that do not exist:
tst_h_rdc0
There are also some tests which cdl_do_maps depends on, but it is
also not defined if HAVE_BASH isn't true. CMake errors out with:
CMake Error at examples/CDL/CMakeLists.txt:10 (SET_TESTS_PROPERTIES):
SET_TESTS_PROPERTIES Can not find test to add properties to:
cdl_do_comps
This patch makes these tests conditional, making CMake happy.
2017-11-26 10:17:58 +05:30
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
Nehal J Wani
2b72835c55
Add workaround for sscanf('NaN')
2017-11-26 01:47:50 +05:30
Nehal J Wani
f5e650a669
Use refactored variable names introduced by 773fe807
2017-11-26 01:47:46 +05:30
Ward Fisher
5163189f0c
Merge branch 'cmake-parallel-testing'
2017-11-25 11:57:01 -07:00
Ed Hartnett
579bfcb766
removed tst_ctest.sh from cmake build
2017-11-25 07:42:11 -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
6fdbbf480d
removed redundant check
2017-11-25 05:23:45 -07:00
Ed Hartnett
c8605e07c6
removing dependencies between tests
2017-11-25 05:19:11 -07:00
Ed Hartnett
fa690cd0d8
eliminated dependencies
2017-11-25 05:18:04 -07:00
Ed Hartnett
e064855a10
removed ncdump test dependencies for tst_netcdf4.sh
2017-11-25 04:31:58 -07:00
Ed Hartnett
a208cc028c
changed ncdump C test to build but not run (again) under CMake build
2017-11-25 02:57:13 -07:00
Ed Hartnett
8011fab382
now run tst_large2, also cleaned up some more warnings
2017-11-24 10:50:07 -07:00
Ed Hartnett
8e47b9bbc2
merged ejh_more_warnings
2017-11-24 10:14:57 -07:00
Ed Hartnett
273b1d5bf9
merged ejh_check_test
2017-11-24 10:12:54 -07:00
Ed Hartnett
69f2089723
cleaned up err_macros.h
2017-11-24 10:03:01 -07:00
Ed Hartnett
fa7f17a8c8
got cmake working with HDF4 format test
2017-11-24 06:05:55 -07:00
Dennis Heimbigner
4db4393e69
Begin changing over to use strlcat instead of strncat because
...
strlcat provides better protection against buffer overflows.
Code is taken from the FreeBSD project source code. Specifically:
https://github.com/freebsd/freebsd/blob/master/lib/libc/string/strlcat.c
License appears to be acceptable, but needs to be checked by e.g. Debian.
Step 1:
1. Add to netcdf-c/include/ncconfigure.h to use our version
if not already available as determined by HAVE_STRLCAT in config.h.
2. Add the strlcat code to libdispatch/dstring.c
3. Turns out that strlcat was already defined in several places.
So remove it from:
ncgen3/genlib.c
ncdump/dumplib.c
3. Define strlcat extern definition in ncconfigure.h.
4. Modify following directories to use strlcat:
libdap2 libdap4 ncdap_test dap4_test
Will do others in subsequent steps.
2017-11-23 10:55:24 -07:00
Ed Hartnett
b4bccb60b3
fixing test order problem
2017-11-23 07:18:12 -07:00
Ed Hartnett
1456e227ff
more changes to attempt to get cmake working
2017-11-23 06:21:08 -07:00
Ed Hartnett
fab6ed8346
combined two tests to eliminate dependency
2017-11-23 05:02:13 -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
0c7684b1ac
removed tst_filters from CMake build
2017-11-22 12:42:59 -07:00
Ward Fisher
1ccdf0219f
Work towards parallel testing via cmake.
2017-11-22 12:10:58 -07:00
Ward Fisher
136a717d26
Getting tests to run in parallel under cmake
2017-11-22 11:37:00 -07:00
Ed Hartnett
2b3e1b1c86
trying to get cmake build to work
2017-11-22 10:21:51 -07:00
Ed Hartnett
d64550d3f0
Merge branch 'master' into ejh_notbuilt_errors
2017-11-22 17:14:24 +00:00
Ed Hartnett
74a895a394
fixed copy of HDF4 file in CMake build with nc_test/tst_formats.c
2017-11-22 09:52:40 -07:00
Ed Hartnett
365bd0cef2
added new test to CMake build
2017-11-22 08:26:53 -07:00
Ed Hartnett
845355e91b
added hdf4 test for inq_format calls
2017-11-22 08:21:24 -07:00
Ed Hartnett
d4495e8e86
more testing
2017-11-22 07:46:03 -07:00
Ed Hartnett
b5ed095f36
makefile cleanup
2017-11-22 07:05:10 -07:00
Ed Hartnett
70c739858b
fixed SEGFAULT for NULL parameter for nc_inq_format(), added testing, improved documentation
2017-11-22 06:53:23 -07:00
Ed Hartnett
3a48f59de3
removed legacy test that was no longer being run
2017-11-21 19:46:05 -07:00
Ward Fisher
64b500cf24
Merge pull request #665 from NetCDF-World-Domination-Council/ejh_ncdump_3
...
Autotools build system tweaks and fixes to get make -j check and make -j distcheck working
2017-11-21 18:16:33 -07:00
