Commit Graph

  • f357081b57 Not all systems (e.g. osx) have malloc.h, include stdlib.h instead. Eric Haszlakiewicz 2020-04-08 02:53:48 +00:00
  • 2782a6b62c Try yet again to fix the osx build, this time do set +e Eric Haszlakiewicz 2020-04-08 02:39:03 +00:00
  • a86ae1df9a Another attempt at debugging the travis osx build, this time just ignore errors. Eric Haszlakiewicz 2020-04-08 02:28:02 +00:00
  • 829e0829dd Wait a while before exiting travis to allow output to flush. Eric Haszlakiewicz 2020-04-08 02:17:14 +00:00
  • cf8421c36d Apparently cmake is already installed on travis osx builds. Try another approach to figure out what was failing. Eric Haszlakiewicz 2020-04-08 02:02:25 +00:00
  • fb0b653612 Install cmake on osx travis builds. s/make check/make test/ Eric Haszlakiewicz 2020-04-08 01:45:49 +00:00
  • a3b82cbc77 Perform the travis build in a subdir, so the distcheck target works. Eric Haszlakiewicz 2020-04-08 01:34:22 +00:00
  • 677a8ccf44 Switch travis to use cmake instead of autoconf. Eric Haszlakiewicz 2020-04-08 01:21:11 +00:00
  • 19bbf2c069 Add includes and split off json_types.h to help ensure that headers can be included in any order. Eric Haszlakiewicz 2020-04-06 13:55:27 +00:00
  • 5e19c26cae Don't let clang-format rearrange Windows includes, since they need to be in a particular order. Eric Haszlakiewicz 2020-04-06 02:47:34 +00:00
  • 9acc4e9d71 Format random_seed.c with clang-format, with key asm sections excluded. Eric Haszlakiewicz 2020-04-06 01:52:28 +00:00
  • 9a494081cb Update the style guide to mention that we're using clang-format now. Eric Haszlakiewicz 2020-04-06 01:49:14 +00:00
  • 31f1ab2be1 Merge pull request #555 from dota17/chang_format_3 Eric Haszlakiewicz 2020-04-03 00:13:34 -04:00
  • 8b162c4b89 clang-format the files dota17 2020-03-28 10:25:00 +08:00
  • c117d8a8a8 add the disabling formatting coments and adjust the partial code manuly dota17 2020-03-27 13:04:50 +08:00
  • a8cec740f0 add options dota17 2020-03-10 15:47:53 +08:00
  • df7833e9a3 clang-format dota17 2020-03-06 17:15:05 +08:00
  • ed54353d84 Merge pull request #563 from robybeen/master Eric Haszlakiewicz 2020-04-02 22:35:21 -04:00
  • 5d9b8e0fef Changed order of calloc args to match stdlib (2) Robert 2020-04-02 19:28:55 +02:00
  • 56f81811c2 Changed order of calloc args to match stdlib Robert 2020-04-02 19:23:10 +02:00
  • 6afcf1606b Merge pull request #562 from dota17/testcase_add Eric Haszlakiewicz 2020-04-02 11:23:39 -04:00
  • 3822177473 add test cases dota17 2020-03-30 17:32:06 +08:00
  • c2ba379b03 Merge pull request #561 from dota17/add_badge Chen 2020-03-31 10:54:45 +08:00
  • 203bacb24d add the badge in README.md and test the coveralls dota17 2020-03-30 15:43:50 +08:00
  • d1650a582e Merge pull request #541 from dota17/coveralls_final Chen 2020-03-28 10:42:17 +08:00
  • 541a0b609a modify the coveralls configuration file dota17 2020-02-19 18:13:28 +08:00
  • 353ef26bda Merge pull request #558 from dota17/doc_message_modify Chen 2020-03-20 11:17:20 +08:00
  • 1204a1fded modify the doc target message dota17 2020-03-19 10:23:29 +08:00
  • a06339215e Merge pull request #556 from Jehan/wip/Jehan/fix-broken-mingw-w64 Eric Haszlakiewicz 2020-03-16 21:24:14 -05:00
  • b15e7ba470 Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64 Jehan 2020-03-15 23:29:37 +01:00
  • e94eb90f9f Merge pull request #546 from dota17/make_unistall Eric Haszlakiewicz 2020-03-10 22:12:13 -05:00
  • c14c6caa32 delete -r in uninstall dota17 2020-03-11 10:47:04 +08:00
  • a8c9284f06 Merge pull request #547 from dota17/assert_test Eric Haszlakiewicz 2020-03-03 07:54:21 -06:00
  • 0030e905b4 modify RELEASE dota17 2020-03-03 14:16:13 +08:00
  • e56ab0146f update testcase and delete debug -O0 build dota17 2020-03-02 20:19:35 +08:00
  • b3296e778f Follow up the PR#542: improve assert() calls, simplify code in json_object_equal(). Eric Haszlakiewicz 2020-03-02 02:08:49 +00:00
  • 737aee40c4 Merge pull request #542 from dota17/adduint64_final Eric Haszlakiewicz 2020-03-01 08:51:26 -05:00
  • 2d44f865c3 modify json-c default build type, and fix up the assert() errors in testcase dota17 2020-02-29 15:32:42 +08:00
  • 6359b79847 update json_object.c and testcase, delete json_object_uint_inc() dota17 2020-02-28 11:18:48 +08:00
  • 9532f94fa4 modify partial functions and testcase, in order to support automatic conversion for int64/uint64 dota17 2020-02-27 15:01:06 +08:00
  • 1160c8625c Add uninstall target in cmake dota17 2020-02-27 16:00:09 +08:00
  • c816de212b modify the json_object, replace c_int64/c_uint64 with struct{union{int64, uint64},...} dota17 2020-02-26 20:54:36 +08:00
  • 30e00cf757 Merge pull request #545 from dota17/make_doc Eric Haszlakiewicz 2020-02-26 20:56:22 -05:00
  • e3b6521baa add doc target on cmake dota17 2020-02-26 15:39:27 +08:00
  • 5a2b9139f9 Merge pull request #544 from dota17/distcheck Eric Haszlakiewicz 2020-02-25 21:48:35 -05:00
  • a0129c9761 Merge pull request #543 from dota17/readme Eric Haszlakiewicz 2020-02-25 21:38:18 -05:00
  • 77d7a99c75 Increase distcheck target in cmake dota17 2020-02-21 12:16:51 +08:00
  • 0ccb296263 Update README.md Chen 2020-02-25 16:20:41 +08:00
  • f69fbd897b Added documentation for camke-configure dota17 2020-02-25 15:01:05 +08:00
  • 3c3b5920f7 add uint64 data to json-c dota17 2020-02-20 15:17:05 +08:00
  • c684b1d40b add coveralls auto tool to json-c dota17 2020-02-17 18:15:15 +08:00
  • 518f337ce8 Issue #539: use a internal-only serializer function in json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Also, document the serializer-resetting behavior of json_object_set_double(). Eric Haszlakiewicz 2020-02-14 03:48:02 +00:00
  • 4bf7ffa984 Issue #539: be sure to clean up at the end of test_set_value. Eric Haszlakiewicz 2020-02-14 03:25:46 +00:00
  • ae13ca524a Issue #539: reset the serializer when json_object_set_double() is called and the current serializer is the one that json_object_new_double_s() used. Eric Haszlakiewicz 2020-02-13 03:11:10 +00:00
  • 0ffdbb2395 Merge pull request #531 from dota17/utf8test Eric Haszlakiewicz 2020-02-05 21:56:06 -05:00
  • 1934eddf29 Merge pull request #536 from dota17/new_null Eric Haszlakiewicz 2020-01-21 23:23:53 -05:00
  • 7ad72b81c5 update comment dota17 2020-01-22 09:56:52 +08:00
  • 010f33d460 add json_object_new_null dota17 2020-01-20 15:00:11 +08:00
  • 787a8b3f1c update code dota17 2020-01-17 15:33:44 +08:00
  • 360d28b961 Merge pull request #533 from sunpoet/master Eric Haszlakiewicz 2020-01-12 22:42:02 -05:00
  • bb5971ba2a Fix make check Po-Chuan Hsieh 2020-01-11 07:20:44 +00:00
  • eca74dcccf test utf8 dota17 2020-01-08 19:42:05 +08:00
  • e651e96a5b Merge pull request #526 from dota17/addTestCase_printbuf Eric Haszlakiewicz 2020-01-03 08:32:53 -05:00
  • a255510cca Merge pull request #525 from dota17/addPointerTestcase Eric Haszlakiewicz 2020-01-03 08:31:41 -05:00
  • 8c0cb0bd28 Increased the test coverage of printbuf.c 82% to 92%. chenguoping 2020-01-03 14:34:35 +08:00
  • 0421772bbc Merge pull request #523 from dota17/updatetestcase Eric Haszlakiewicz 2020-01-02 22:22:57 -05:00
  • 4bfed6eb2f Merge pull request #522 from dota17/addVisitTestcase Eric Haszlakiewicz 2020-01-02 22:22:09 -05:00
  • 5fe4448541 update tsetcase for tokener_c dota17 2020-01-02 16:18:59 +08:00
  • a5089f5a79 update json_visit testcase dota17 2019-12-31 11:27:09 +08:00
  • 48ae9e8874 update pointer test case dota17 2019-12-30 09:45:28 +08:00
  • ee34939e74 Merge pull request #519 from dota17/addTestCase_obj_token Eric Haszlakiewicz 2019-12-29 16:02:04 -05:00
  • 424b315ce0 pointer types discards qualifiers chenguoping 2019-12-27 15:39:31 +08:00
  • 1446572997 add testcases of object and token chenguoping 2019-12-27 15:07:00 +08:00
  • d6b968dff7 Merge pull request #512 from JaapKeuter/cmake_test Eric Haszlakiewicz 2019-12-12 22:30:15 -05:00
  • 78d8e5c3d5 Properly append to CMAKE_C_FLAGS string Jaap Keuter 2019-12-12 21:28:03 +01:00
  • 6c55f65d07 Set cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_LIBRARIES (currently, adds -lm). See issue #510. Eric Haszlakiewicz 2019-12-06 00:15:14 -05:00
  • 0819a55ffb Undefine NDEBUG for tests - cmake version. See issue #501. Eric Haszlakiewicz 2019-12-05 23:18:59 -05:00
  • 37b4da6b92 Merge pull request #501 from andy5995/iss_406-2 Eric Haszlakiewicz 2019-12-05 23:18:46 -05:00
  • 581b94b3bd Add a shim script to ease shift from autoconf to cmake. Eric Haszlakiewicz 2019-12-01 23:42:40 -05:00
  • 11a638048d Add a few missing features to the cmake setup that are present in configure.ac: Include all compiler warnings, and provide DISABLE_WERROR to make them not be errors. Define _REENTRANT, if setting it works. Set -Bsymbolic-functions, and provide DISABLE_BSYMBOLIC to turn that off. Implement the check for HAS_GNU_WARNING_LONG Eric Haszlakiewicz 2019-11-26 23:01:27 -05:00
  • a92e6d2c28 Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too. Eric Haszlakiewicz 2019-11-25 23:26:48 -05:00
  • 41f434e89f Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient. Eric Haszlakiewicz 2019-11-23 23:55:04 -05:00
  • b99be9cf4e Fix up the test_util_file test for builds on Windows VS2015. Eric Haszlakiewicz 2019-11-23 23:14:24 -05:00
  • 7f30afc6e5 Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed. Eric Haszlakiewicz 2019-11-23 20:31:14 -05:00
  • 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. Eric Haszlakiewicz 2019-11-23 15:34:23 -05:00
  • bdaff94e9a Build and run the tests as part of the cmake build. Eric Haszlakiewicz 2019-11-23 15:15:48 -05:00
  • 25aedddcdf Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main(). Eric Haszlakiewicz 2019-11-23 12:05:28 -05:00
  • 3d3b014971 Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests. Eric Haszlakiewicz 2019-11-23 12:03:27 -05:00
  • b1ad748842 Extend test_double_serializer to check NaN and Infinity handling. Eric Haszlakiewicz 2019-11-22 22:56:33 -05:00
  • af8dd4a307 Define vars earlier to fix old Windows builds. Eric Haszlakiewicz 2019-11-10 20:35:30 -05:00
  • baed9983b3 Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified. Eric Haszlakiewicz 2019-11-10 00:12:27 -05:00
  • ac26ea9c5b Add a test for serializing the double value -1.0. Eric Haszlakiewicz 2019-11-10 00:10:28 -05:00
  • ddd049045d Merge pull request #505 from grdowns/vcpkg-instructions Eric Haszlakiewicz 2019-09-26 22:23:52 -04:00
  • 7ef51239a9 Update dependencies grdowns 2019-09-26 17:11:49 -07:00
  • 760c1e284c Add vcpkg installation instructions grdowns 2019-09-26 17:09:39 -07:00
  • eae040a84a Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows. Eric Haszlakiewicz 2019-09-08 22:42:36 -04:00
  • 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. Eric Haszlakiewicz 2019-09-08 22:27:30 -04:00
  • 05b41b159e Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset. Eric Haszlakiewicz 2019-09-08 21:35:37 -04:00
  • 087534c030 Minor cleanup of includes in a couple of tests. Eric Haszlakiewicz 2019-09-08 21:34:13 -04:00
  • 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. Eric Haszlakiewicz 2019-08-12 00:30:45 +00:00