search for: getopt_tests

--- .gitignore | 1 + mllib/Makefile.am | 30 ++++++++- mllib/getopt_tests.ml | 68 ++++++++++++++++++++ mllib/test-getopt.sh | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 265 insertions(+), 2 deletions(-) create mode 100644 mllib/getopt_tests.ml create mode 100755 mllib/test-getopt.sh diff --git a/.gitignore b/.gitignore index 000e984..c...

I have the following script (also attached): #!/usr/bin/Rscript spec=matrix(c( 'verbose', 'v', 1, "integer", 'help' , 'h', 0, "logical" ),ncol=4, byrow=TRUE) spec.dim=dim(spec) spec.opt.long=spec[,1] spec.opt.short=spec[,2] spec.opt.l <- spec.dim[1] infile <- "test.dat" args=commandArgs(TRUE); l=length(args) self =

Introduce a new type of option with an optional string argument. --- common/mltools/getopt-c.c | 20 +++++++++++++++++++- common/mltools/getopt.ml | 5 ++++- common/mltools/getopt.mli | 4 ++++ common/mltools/getopt_tests.ml | 18 +++++++++++++++++- common/mltools/test-getopt.sh | 11 +++++++++++ 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/common/mltools/getopt-c.c b/common/mltools/getopt-c.c index 7b7e39be2..5fa703428 100644 --- a/common/mltools/getopt-c.c +++ b/common/mltools/getopt-c.c @@ -27...

Introduce a new type of option with an optional string argument. --- common/mltools/getopt-c.c | 20 +++++++++++++++++++- common/mltools/getopt.ml | 5 ++++- common/mltools/getopt.mli | 4 ++++ common/mltools/getopt_tests.ml | 18 +++++++++++++++++- common/mltools/test-getopt.sh | 11 +++++++++++ 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/common/mltools/getopt-c.c b/common/mltools/getopt-c.c index 7b7e39be2..5fa703428 100644 --- a/common/mltools/getopt-c.c +++ b/common/mltools/getopt-c.c @@ -27...

...ing OCaml tools: add output selection for --machine-readable builder/cmdline.ml | 12 ++++---- builder/repository_main.ml | 2 +- common/mltools/getopt-c.c | 20 ++++++++++++- common/mltools/getopt.ml | 5 +++- common/mltools/getopt.mli | 4 +++ common/mltools/getopt_tests.ml | 18 +++++++++++- common/mltools/test-getopt.sh | 11 +++++++ common/mltools/tools_utils.ml | 52 +++++++++++++++++++++++++++++++++- common/mltools/tools_utils.mli | 6 ++++ dib/cmdline.ml | 4 +-- get-kernel/get_kernel.ml | 2 +- resize/resize.ml | 22 +...

The second patch is obviously not complete yet - for discussion only. Rich.

...s only the Getopt.t handle. This way, it will be easy to add more data needed for handling standard command line options. This is mostly refactoring, with no functional changes. --- builder/cmdline.ml | 2 +- builder/repository_main.ml | 2 +- common/mltools/getopt_tests.ml | 2 +- common/mltools/machine_readable_tests.ml | 2 +- common/mltools/tools_utils.ml | 9 ++++++++- common/mltools/tools_utils.mli | 10 ++++++++-- customize/customize_main.ml | 2 +- dib/cmdline.ml | 2 +- get-kernel/g...

...| 4 -- common/mlstdutils/std_utils.mli | 7 +-- common/mltools/Makefile.am | 35 ++++++++++++- common/mltools/getopt-c.c | 20 ++++++- common/mltools/getopt.ml | 26 +++++++-- common/mltools/getopt.mli | 4 ++ common/mltools/getopt_tests.ml | 18 ++++++- common/mltools/machine_readable_tests.ml | 41 +++++++++++++++ common/mltools/test-getopt.sh | 11 ++++ common/mltools/test-machine-readable.sh | 67 ++++++++++++++++++++++++ common/mltools/tools_utils.ml | 53 ++++++++++++++++++- common/mltools/too...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

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

...mon/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/mltools/tools_messages_tests.ml common/mltools/tools_utils.ml -common/mltools/tools_utils_tests.ml common/mltools/urandom.ml common/mltools/xpath_helpers.ml com...

...100644 --- a/.gitignore +++ b/.gitignore @@ -113,7 +113,6 @@ Makefile.in /builder/virt-index-validate /builder/virt-index-validate.1 /builder/*.xz -/builder/yajl_tests /cat/stamp-virt-*.pod /cat/virt-cat /cat/virt-cat.1 @@ -146,6 +145,7 @@ Makefile.in /common/mltools/.depend /common/mltools/getopt_tests /common/mltools/JSON_tests +/common/mltools/JSON_parser_tests /common/mltools/tools_utils_tests /common/mltools/oUnit-* /common/mlutils/.depend diff --git a/builder/Makefile.am b/builder/Makefile.am index 7ede544b7..f64750c7f 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -45,8 +...

...ons(+), 66 deletions(-) create mode 100644 common/mltools/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...

..._CMA) \ + $(top_srcdir)/ocaml-link.sh common_utils_tests_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ $(common_utils_tests_THEOBJECTS) -o $@ -getopt_tests_DEPENDENCIES = $(getopt_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh +getopt_tests_DEPENDENCIES = \ + $(getopt_tests_THEOBJECTS) \ + $(MLLIB_CMA) \ + $(top_srcdir)/ocaml-link.sh getopt_tests_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \ $(OCAMLFIND...

...s/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/mltools/tools_messages_tests.ml > common/mltools/tools_utils.ml > -common/mltools/tools_utils_tests.ml > common/mltools/urandom....

...mount-fd /generator/.depend -/generator/bytes.ml /generator/common_utils.ml /generator/common_utils.mli /generator/files-generated.txt @@ -366,7 +366,6 @@ Makefile.in /make-fs/virt-make-fs.1 /missing /mllib/.depend -/mllib/bytes.ml /mllib/common_gettext.ml /mllib/common_utils_tests /mllib/getopt_tests diff --git a/generator/Makefile.am b/generator/Makefile.am index 401029d..3f54ad5 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -114,7 +114,7 @@ sources = \ # In build dependency order. objects = \ - $(OCAML_GENERATOR_BYTES_COMPAT_CMO) \ + $(OCAML_BYTES_COMPAT_CMO) \ ../co...

...mon/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/mltools/tools_messages_tests.ml common/mltools/tools_utils.ml -common/mltools/tools_utils_tests.ml common/mltools/urandom.ml common/mltools/xpath_helpers.ml com...

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