Commit Graph

827 Commits

Author SHA1 Message Date
Eric Haszlakiewicz
a92e6d2c28 Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too. 2019-11-25 23:26:48 -05:00
Eric Haszlakiewicz
41f434e89f Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient. 2019-11-23 23:55:04 -05:00
Eric Haszlakiewicz
b99be9cf4e Fix up the test_util_file test for builds on Windows VS2015. 2019-11-23 23:14:24 -05:00
Eric Haszlakiewicz
7f30afc6e5 Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed. 2019-11-23 20:31:14 -05:00
Eric Haszlakiewicz
f19abcf981 Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc. 2019-11-23 15:34:23 -05:00
Eric Haszlakiewicz
bdaff94e9a Build and run the tests as part of the cmake build. 2019-11-23 15:15:48 -05:00
Eric Haszlakiewicz
25aedddcdf Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main(). 2019-11-23 12:05:28 -05:00
Eric Haszlakiewicz
3d3b014971 Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests. 2019-11-23 12:03:27 -05:00
Eric Haszlakiewicz
b1ad748842 Extend test_double_serializer to check NaN and Infinity handling. 2019-11-22 22:56:33 -05:00
Eric Haszlakiewicz
af8dd4a307 Define vars earlier to fix old Windows builds. 2019-11-10 20:35:30 -05:00
Eric Haszlakiewicz
baed9983b3 Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified. 2019-11-10 00:14:44 -05:00
Eric Haszlakiewicz
ac26ea9c5b Add a test for serializing the double value -1.0. 2019-11-10 00:13:00 -05:00
Eric Haszlakiewicz
ddd049045d Merge pull request #505 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
2019-09-26 22:23:52 -04:00
grdowns
7ef51239a9 Update dependencies 2019-09-26 17:11:49 -07:00
grdowns
760c1e284c Add vcpkg installation instructions 2019-09-26 17:09:39 -07:00
Eric Haszlakiewicz
eae040a84a Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows. 2019-09-08 22:42:36 -04:00
Eric Haszlakiewicz
374ffe87c6 Issue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment.
The second call to newlocale() with LC_TIME accidentally made things
 work because LC_TIME == LC_NUMERIC_MASK on some platforms.
2019-09-08 22:27:30 -04:00
Eric Haszlakiewicz
05b41b159e Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset. 2019-09-08 21:35:37 -04:00
Eric Haszlakiewicz
087534c030 Minor cleanup of includes in a couple of tests. 2019-09-08 21:34:13 -04:00
Eric Haszlakiewicz
d0b87ee87b Add an explicit cast to double to squash a -Wimplicit-int-float-conversion warning.
Though we will no longer be comparing exactly against INT64_MAX, this is ok
because any value of that magnitude stored in a double will *also* have been
rounded up, so the comparison will work appropriately.
2019-08-12 00:30:45 +00:00
Eric Haszlakiewicz
a91aa5e35d Merge pull request #499 from andy5995/travis_valgrind
.travis.yml:test on more recent clang and gcc versions
2019-07-27 09:29:57 -04:00
andy5995
509600a7f7 add xenial default clang with CHECK enabled 2019-07-26 23:51:18 -05:00
andy5995
4f69529a04 add missing dist 2019-07-26 23:36:01 -05:00
andy5995
dd08b70e46 manually use apt-get to install packages on bionic 2019-07-26 23:21:20 -05:00
andy5995
dd0eef6aab add tests on bionic beaver 2019-07-26 22:42:53 -05:00
andy5995
163db3f6d0 revert toolchain back to "test" 2019-07-26 22:24:12 -05:00
andy5995
1da4b23235 change key 2019-07-26 22:24:12 -05:00
andy5995
a49f1dee8a use "non-test" ppa
Maybe something weird about how gcc is configured with the test
toolchain?
2019-07-26 22:24:12 -05:00
andy5995
897b49f475 remove useless condition that shows logs 2019-07-26 22:24:12 -05:00
andy5995
b140c473d1 install doxygen so 'make distcheck' can succeed 2019-07-26 22:24:12 -05:00
andy5995
6288be340c test for more compilers 2019-07-26 22:24:12 -05:00
andy5995
57e79e1d0b show the logs if tests fail 2019-07-26 22:24:12 -05:00
andy5995
50e7fff0f3 .travis.yml:install valgrind
(#498)
2019-07-26 22:24:12 -05:00
Eric Haszlakiewicz
c8e1b59ae5 Merge pull request #495 from andy5995/README_typos
README.md:fix 2 typos
2019-07-26 23:08:11 -04:00
andy5995
1c7e891e44 "make its use in" [skip ci] 2019-07-26 12:59:24 -05:00
Eric Haszlakiewicz
4a94ddbd8b Merge pull request #500 from andy5995/add_missing_test_deps
test/Makefile.am:add missing deps for test1 and test2
2019-07-26 09:48:34 -04:00
andy5995
e2f46b9f79 partial revert (make use) [skip ci] 2019-07-25 22:55:07 -05:00
Eric Haszlakiewicz
68abf12afa Issue #498: Fix a memory leak bug introduced in test_double_serializer in 485f2a02 by adding a json_object_put call. 2019-07-26 03:35:38 +00:00
Eric Haszlakiewicz
48984dbd42 Merge pull request #496 from andy5995/pointer_doc
json_pointer.h:suggest minor grammar improvement for pointer doc
2019-07-25 22:58:22 -04:00
andy5995
8ab8df1170 test/Makefile.am:add missing deps for test1 and test2
Allows the tests to pass when running `make distcheck`

This fixes the 2 broken tests I mentioned at
https://github.com/json-c/json-c/pull/499#discussion_r306998261
2019-07-25 14:59:56 -05:00
andy5995
a9c34d5531 json_pointer.h:suggest minor grammar improvement for pointer doc 2019-07-23 23:53:06 -05:00
andy5995
3969487376 README.md:fix 2 typos 2019-07-23 23:43:59 -05:00
Eric Haszlakiewicz
07ea04e651 Merge pull request #491 from ploxiln/disable_werror
build: add option --disable-werror to configure
2019-06-09 14:05:46 -04:00
Pierce Lopez
634900d270 tests: appease -Wwrite-strings 2019-06-09 12:17:06 -04:00
Pierce Lopez
44605744dc build: fix compiler option -Wwrite-strings
was typod as -Wwrite-string
2019-06-09 10:55:50 -04:00
Pierce Lopez
21c886534f build: add --disable-werror option to configure
to omit -Werror compiler option
2019-06-09 10:53:56 -04:00
Eric Haszlakiewicz
2b1903cc69 Merge pull request #485 from myd7349/fix-cmake-module
Install CMake module files
2019-05-30 22:38:29 -04:00
Eric Haszlakiewicz
485f2a02c7 Issue #486: append a missing ".0" to negative double values too. 2019-05-28 02:44:22 +00:00
myd7349
c2036ab9fc Install CMake module files 2019-05-18 19:44:29 +08:00
Eric Haszlakiewicz
3e81b4abe3 Merge pull request #474 from Jehan/fix-pc-file-cmake
Installation directories empty with CMake in pkg-config.
2019-01-26 10:55:50 -05:00