search for: pcre_tests

Str is a pretty ugly regexp module. Let's try to replace it with PCRE. This series of commits goes some small way towards that eventual goal. - - - I wonder if there was a deep reason why we had this? let unix2dos s = String.concat "\r\n" (Str.split_delim (Str.regexp_string "\n") s) I replaced it with what I think should be (nearly) equivalent: let unix2dos s =

--- common/mlpcre/pcre-c.c | 7 +++++-- common/mlpcre/pcre_tests.ml | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c index 6fae0e6f4..da9b50d34 100644 --- a/common/mlpcre/pcre-c.c +++ b/common/mlpcre/pcre-c.c @@ -201,6 +201,7 @@ value guestfs_int_pcre_sub (value nv) { CAMLparam1 (nv...

This way it is possible to change where the matching start, instead of always assuming it is the beginning. --- common/mlpcre/PCRE.ml | 2 +- common/mlpcre/PCRE.mli | 5 ++++- common/mlpcre/pcre-c.c | 16 +++++++++++++--- common/mlpcre/pcre_tests.ml | 11 ++++++++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/common/mlpcre/PCRE.ml b/common/mlpcre/PCRE.ml index b054928f9..33074af1c 100644 --- a/common/mlpcre/PCRE.ml +++ b/common/mlpcre/PCRE.ml @@ -23,7 +23,7 @@ exception Error of string * int type regexp external com...

--- common/mlpcre/PCRE.ml | 3 +-- common/mlpcre/PCRE.mli | 14 ++++++++++++++ common/mlpcre/pcre-c.c | 27 +++++++++++++++++++++++++++ common/mlpcre/pcre_tests.ml | 19 ++++++++++++++++--- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/common/mlpcre/PCRE.ml b/common/mlpcre/PCRE.ml index 94eea4b34..5269d41f8 100644 --- a/common/mlpcre/PCRE.ml +++ b/common/mlpcre/PCRE.ml @@ -23,10 +23,9 @@ exception Error of string * int type regexp ext...

This way it is possible to change where the matching start, instead of always assuming it is the beginning. --- common/mlpcre/PCRE.ml | 2 +- common/mlpcre/PCRE.mli | 5 ++++- common/mlpcre/pcre-c.c | 16 +++++++++++++--- common/mlpcre/pcre_tests.ml | 15 ++++++++++++--- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/common/mlpcre/PCRE.ml b/common/mlpcre/PCRE.ml index b054928f9..33074af1c 100644 --- a/common/mlpcre/PCRE.ml +++ b/common/mlpcre/PCRE.ml @@ -23,7 +23,7 @@ exception Error of string * int type regexp external...

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As

...based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with %{...}-like variables (only 3 added ATM, more can be added) to change their paths depending on data of the guest/disks. Changes from v1: - remove extra code for optional named parameters in pcre_tests.ml - allow %-escaping of variables in Var_expander Pino Toscano (3): common/mlpcre: add offset flag for PCRE.matches v2v: add Var_expander v2v: add -o json output mode .gitignore | 1 + common/mlpcre/PCRE.ml | 2 +- common/mlpcre/PCRE.mli | 5 +- com...

...Pino Toscano (3): common/mlpcre: add offset flag for PCRE.matches v2v: add Var_expander v2v: add -o json output mode .gitignore | 1 + common/mlpcre/PCRE.ml | 2 +- common/mlpcre/PCRE.mli | 5 +- common/mlpcre/pcre-c.c | 16 +- common/mlpcre/pcre_tests.ml | 15 +- v2v/Makefile.am | 36 +++- v2v/cmdline.ml | 29 +++ v2v/create_json.ml | 348 ++++++++++++++++++++++++++++++++++ v2v/create_json.mli | 29 +++ v2v/dummy.c | 2 + v2v/output_json.ml | 116 ++++++++++++...

...mv $@-t $@ diff --git a/po/POTFILES-ml b/po/POTFILES-ml index dae9bd1a..7512d63b 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -3,32 +3,23 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.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 co...

We'd like to use PCRE instead of the awful Str module. However I don't necessarily want to pull in the extra dependency of ocaml-pcre, and in any case ocaml-pcre is rather difficult to use. This introduces very simplified and lightweight bindings for PCRE. They work rather like Str in that there is some global state (actually thread-local in this implementation) between the matching and

...-ml b/po/POTFILES-ml > index dae9bd1a..7512d63b 100644 > --- a/po/POTFILES-ml > +++ b/po/POTFILES-ml > @@ -3,32 +3,23 @@ common/mlcustomize/customize_cmdline.ml > common/mlcustomize/firstboot.ml > common/mlgettext/common_gettext.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_te...

...dex.ml builder/index_parser.ml -builder/index_parser_tests.ml builder/ini_reader.ml builder/languages.ml builder/list_entries.ml @@ -23,37 +22,27 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.ml common/mlpcre/PCRE.ml -common/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 -c...

v2: - Change the OCaml code in the daemon to use PCRE instead of Str. - Call pcre_compile2 so we can capture the error code on failure. - Extend the test suite. - Some other cleanups, but very minor. Rich.

The previously selected 'atomic' recipe resulted in 2GB swap in a 6GB volume. Also, we don't really need the boot partition, so just create a partition using the whole disk space. --- builder/templates/debian.preseed | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/builder/templates/debian.preseed b/builder/templates/debian.preseed index

Commit 0a94cae15bae7cecb725e78e485708694d347612 added useful headings to parts of the configure script. This refactors the code by adding a common macro (‘HEADING’), and also changes the output so it's clearer at a glance: --- Checking for Haskell --- checking for ghc... (cached) ghc --- Checking for PHP --- checking for php... (cached) php checking for phpize... (cached) phpize

...tignore b/.gitignore index 4d738d10f..8446d3af5 100644 --- a/.gitignore +++ b/.gitignore @@ -123,6 +123,7 @@ Makefile.in /common/errnostring/errnostring-gperf.gperf /common/errnostring/errnostring.h /common/miniexpect/miniexpect.3 +/common/mlaugeas/.depend /common/mlpcre/.depend /common/mlpcre/pcre_tests /common/mlprogress/.depend diff --git a/Makefile.am b/Makefile.am index e71328a58..e62f2678e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,6 +45,7 @@ SUBDIRS += lib docs examples po # The daemon and the appliance. SUBDIRS += common/mlutils +SUBDIRS += common/mlaugeas SUBDIRS += common/mlp...

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

.../.gitignore index bfe44cd97..d62d5a0a0 100644 --- a/.gitignore +++ b/.gitignore @@ -133,6 +133,8 @@ Makefile.in /common/mlaugeas/.depend /common/mlgettext/.depend /common/mlgettext/common_gettext.ml +/common/mllibvirt/.depend +/common/mllibvirt/libvirt_c.c /common/mlpcre/.depend /common/mlpcre/pcre_tests /common/mlprogress/.depend diff --git a/Makefile.am b/Makefile.am index cf9ca512e..259e5cd93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,9 @@ SUBDIRS += common/mlprogress SUBDIRS += common/mlvisit SUBDIRS += common/mlxml SUBDIRS += common/mltools +if HAVE_LIBVIRT +SUBDIRS += commo...