search for: json_parser_test

Easy way to parse JSON from a file, without reading it all to string first. --- common/mltools/JSON_parser-c.c | 25 +++++++++++++++++++++++++ common/mltools/JSON_parser.ml | 1 + common/mltools/JSON_parser.mli | 3 +++ common/mltools/JSON_parser_tests.ml | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/common/mltools/JSON_parser-c.c b/common/mltools/JSON_parser-c.c index e10a2b69d..be1f011d1 100644 --- a/common/mltools/JSON_parser-c.c +++ b/common/mltools/JSON_parser-c.c @@ -37,6 +37,7 @@ #define JSON_DICT_TAG 5...

...ml | 2 +- builder/utils.mli | 4 +- .../mltools/JSON_parser-c.c | 8 +-- .../yajl.ml => common/mltools/JSON_parser.ml | 38 ++++++------- .../mltools/JSON_parser.mli | 42 +++++++------- .../mltools/JSON_parser_tests.ml | 56 +++++++++--------- common/mltools/Makefile.am | 39 ++++++++++++- docs/C_SOURCE_FILES | 4 +- po/POTFILES | 3 +- po/POTFILES-ml | 4 +- 15 files changed, 135 inse...

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other

...t-simplestreams.sh | 64 ++++++------- builder/utils.mli | 2 +- common/mltools/JSON_parser-c.c | 96 ++++++++++++------- common/mltools/JSON_parser.ml | 29 ++---- common/mltools/JSON_parser.mli | 25 ++--- common/mltools/JSON_parser_tests.ml | 77 +++++++-------- 7 files changed, 156 insertions(+), 146 deletions(-) diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml index fa5b887ac..ccbfdff67 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -59,7 +59,7 @@ le...

v2: - Added back the null value. - Reran the tests. Rich.

...create mode 100755 common/mltools/test-tools-messages.sh create mode 100644 common/mltools/tools_messages_tests.ml diff --git a/.gitignore b/.gitignore index 9a448fc4e..bfe44cd97 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ Makefile.in /common/mltools/JSON_tests /common/mltools/JSON_parser_tests /common/mltools/machine_readable_tests +/common/mltools/tools_messages_tests /common/mltools/tools_utils_tests /common/mltools/oUnit-* /common/mlutils/.depend diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am index 37d10e610..ae78b84b7 100644 --- a/common/mltools/Makefile.am...

...xt.ml common/mlpcre/PCRE.ml -common/mlpcre/pcre_tests.ml common/mlstdutils/guestfs_config.ml common/mlstdutils/std_utils.ml -common/mlstdutils/std_utils_tests.ml common/mlstdutils/stringMap.ml common/mlstdutils/stringSet.ml common/mltools/JSON.ml common/mltools/JSON_parser.ml -common/mltools/JSON_parser_tests.ml -common/mltools/JSON_tests.ml common/mltools/URI.ml common/mltools/checksums.ml common/mltools/curl.ml common/mltools/getopt.ml -common/mltools/getopt_tests.ml -common/mltools/machine_readable_tests.ml common/mltools/planner.ml common/mltools/regedit.ml common/mltools/registry.ml -common...

.../machine_readable_tests.ml create mode 100755 common/mltools/test-machine-readable.sh diff --git a/.gitignore b/.gitignore index 14c2ddf3b..7bc5c5e20 100644 --- a/.gitignore +++ b/.gitignore @@ -146,6 +146,7 @@ Makefile.in /common/mltools/getopt_tests /common/mltools/JSON_tests /common/mltools/JSON_parser_tests +/common/mltools/machine_readable_tests /common/mltools/tools_utils_tests /common/mltools/oUnit-* /common/mlutils/.depend diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 9c854ed49..f05aecc76 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -217,14 +217,16 @@ read the man p...

Hi, this adds the possibility to select the output for --machine-readable in OCaml tools. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it possible to add additional output for

Enhance the output in machine parseable mode, by outputting all the messages of OCaml tools as JSON to the machine parseable stream. Related, although not strictly needed for this (and thus can be split if requested), is the addition of the fd format for the machine readable stream. Changes from v1: - use Obj.magic to convert int -> Unix.file_descr - add tests Pino Toscano (4):

...cre/pcre_tests.ml > common/mlstdutils/guestfs_config.ml > common/mlstdutils/std_utils.ml > -common/mlstdutils/std_utils_tests.ml > common/mlstdutils/stringMap.ml > common/mlstdutils/stringSet.ml > common/mltools/JSON.ml > common/mltools/JSON_parser.ml > -common/mltools/JSON_parser_tests.ml > -common/mltools/JSON_tests.ml > common/mltools/URI.ml > common/mltools/checksums.ml > common/mltools/curl.ml > common/mltools/getopt.ml > -common/mltools/getopt_tests.ml > -common/mltools/machine_readable_tests.ml > common/mltools/planner.ml > common/mltools/r...

...ommon/mlpcre/pcre_tests.ml common/mlprogress/progress.ml common/mlstdutils/guestfs_config.ml common/mlstdutils/std_utils.ml -common/mlstdutils/std_utils_tests.ml common/mlstdutils/stringMap.ml common/mlstdutils/stringSet.ml common/mltools/JSON.ml common/mltools/JSON_parser.ml -common/mltools/JSON_parser_tests.ml -common/mltools/JSON_tests.ml common/mltools/URI.ml common/mltools/checksums.ml common/mltools/curl.ml common/mltools/getopt.ml -common/mltools/getopt_tests.ml -common/mltools/machine_readable_tests.ml common/mltools/planner.ml common/mltools/regedit.ml common/mltools/registry.ml -common...