[meta-virtualization] [PATCH] libvirt: Add missing test helpers and remove windows 1252

Bruce Ashfield bruce.ashfield at gmail.com
Tue Sep 6 06:36:25 PDT 2016


merged.

Bruce

On Mon, Sep 5, 2016 at 2:52 AM, <zhe.he at windriver.com> wrote:

> From: He Zhe <zhe.he at windriver.com>
>
> Add missing test helpers
> We don't support windows encoding so remove that case
>
> Signed-off-by: He Zhe <zhe.he at windriver.com>
> ---
>  ...move-Windows-1252-check-from-esxutilstest.patch | 28
> +++++++++++++++++++++
>  .../0001-ptest-add-missing-test_helper-files.patch | 29
> ++++++++++++++++++++++
>  recipes-extended/libvirt/libvirt_1.3.5.bb          |  2 ++
>  3 files changed, 59 insertions(+)
>  create mode 100644 recipes-extended/libvirt/libvirt/0001-ptest-Remove-
> Windows-1252-check-from-esxutilstest.patch
>  create mode 100644 recipes-extended/libvirt/libvirt/0001-ptest-add-
> missing-test_helper-files.patch
>
> diff --git a/recipes-extended/libvirt/libvirt/0001-ptest-Remove-
> Windows-1252-check-from-esxutilstest.patch b/recipes-extended/libvirt/
> libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch
> new file mode 100644
> index 0000000..217bdbc
> --- /dev/null
> +++ b/recipes-extended/libvirt/libvirt/0001-ptest-Remove-
> Windows-1252-check-from-esxutilstest.patch
> @@ -0,0 +1,28 @@
> +From ffc71da15c3da068f85d16617b6e0c0175fc0110 Mon Sep 17 00:00:00 2001
> +From: He Zhe <zhe.he at windriver.com>
> +Date: Tue, 23 Aug 2016 02:28:47 -0400
> +Subject: [PATCH] ptest: Remove Windows-1252 check from esxutilstest
> +
> +Currently we use iconv from glibc-locale and it does not support
> +Windows-1252 and we don't need support windows character encoding.
> +
> +Signed-off-by: He Zhe <zhe.he at windriver.com>
> +---
> + tests/esxutilstest.c | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
> +index 44bdc84..3223de3 100644
> +--- a/tests/esxutilstest.c
> ++++ b/tests/esxutilstest.c
> +@@ -258,7 +258,6 @@ mymain(void)
> +     DO_TEST(ParseDatastorePath);
> +     DO_TEST(ConvertDateTimeToCalendarTime);
> +     DO_TEST(EscapeDatastoreItem);
> +-    DO_TEST(ConvertWindows1252ToUTF8);
> +
> +     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
> + }
> +--
> +2.8.1
> +
> diff --git a/recipes-extended/libvirt/libvirt/0001-ptest-add-
> missing-test_helper-files.patch b/recipes-extended/libvirt/
> libvirt/0001-ptest-add-missing-test_helper-files.patch
> new file mode 100644
> index 0000000..b4f1e27
> --- /dev/null
> +++ b/recipes-extended/libvirt/libvirt/0001-ptest-add-
> missing-test_helper-files.patch
> @@ -0,0 +1,29 @@
> +From e625a42caca492fe7d52b70bbbf83ae4d99cb15e Mon Sep 17 00:00:00 2001
> +From: He Zhe <zhe.he at windriver.com>
> +Date: Tue, 23 Aug 2016 02:16:20 -0400
> +Subject: [PATCH] ptest: add missing test_helper files
> +
> +Signed-off-by: He Zhe <zhe.he at windriver.com>
> +---
> + tests/Makefile.am | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/tests/Makefile.am b/tests/Makefile.am
> +index 1c85656..2f8b9eb 100644
> +--- a/tests/Makefile.am
> ++++ b/tests/Makefile.am
> +@@ -1422,8 +1422,10 @@ install-ptest:
> +       @(for file in $(PTESTS); do \
> +               if [ -f .libs/$$file ]; then \
> +                       install .libs/$$file $(DEST_DIR)/tests; \
> +-              else \
> ++              elif [ -f $(srcdir)/$$file ]; then \
> +                       install $(srcdir)/$$file $(DEST_DIR)/tests; \
> ++              else \
> ++                      install $(builddir)/$$file $(DEST_DIR)/tests; \
> +               fi; \
> +       done;)
> +       @(if [ -d .libs ]; then install .libs/*.so
> $(DEST_DIR)/tests/.libs; fi;)
> +--
> +2.8.1
> +
> diff --git a/recipes-extended/libvirt/libvirt_1.3.5.bb
> b/recipes-extended/libvirt/libvirt_1.3.5.bb
> index 7271ebe..3eff58d 100644
> --- a/recipes-extended/libvirt/libvirt_1.3.5.bb
> +++ b/recipes-extended/libvirt/libvirt_1.3.5.bb
> @@ -35,6 +35,8 @@ SRC_URI = "http://libvirt.org/sources/
> libvirt-${PV}.tar.gz;name=libvirt \
>             file://install-missing-file.patch \
>             file://0001-nsslinktest-also-build-virAtomic.h.patch \
>             file://0001-qemu-Let-empty-default-VNC-password-work-as-document.patch
> \
> +           file://0001-ptest-add-missing-test_helper-files.patch \
> +           file://0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch
> \
>            "
>
>  SRC_URI[libvirt.md5sum] = "f9dc1e63d559eca50ae0ee798a4c6c6d"
> --
> 2.8.3
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-virtualization/attachments/20160906/dbc354a2/attachment-0001.html>


More information about the meta-virtualization mailing list