diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch')
-rw-r--r-- | import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch index a33f56950..b7609a81a 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/runptest.patch @@ -1,14 +1,18 @@ +Update context for 1.3.5. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- Add 'install-ptest' rule. Change TESTS_ENVIRONMENT to allow running outside build dir. Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com> Upstream-status: Pending - -Index: libvirt-1.2.4/tests/Makefile.am -=================================================================== ---- libvirt-1.2.4.orig/tests/Makefile.am -+++ libvirt-1.2.4/tests/Makefile.am -@@ -31,9 +31,11 @@ +--- +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 0c4ad3c..bb4e31a 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -33,11 +33,13 @@ INCLUDES = \ -I$(top_srcdir)/src/conf \ $(GETTEXT_CPPFLAGS) @@ -16,13 +20,17 @@ Index: libvirt-1.2.4/tests/Makefile.am + AM_CFLAGS = \ - -Dabs_builddir="\"$(abs_builddir)\"" \ +- -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ - -Dabs_srcdir="\"$(abs_srcdir)\"" \ +- -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ + -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \ ++ -Dabs_topbuilddir="\"$(PTEST_DIR)\"" \ + -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \ ++ -Dabs_topsrcdir="\"$(PTEST_DIR)\"" \ $(LIBXML_CFLAGS) \ - $(LIBNL_CFLAGS) \ + $(LIBNL_CFLAGS) \ $(GNUTLS_CFLAGS) \ -@@ -48,7 +50,7 @@ +@@ -62,7 +64,7 @@ QEMULIB_LDFLAGS = \ if WITH_DRIVER_MODULES INCLUDES += \ @@ -31,15 +39,12 @@ Index: libvirt-1.2.4/tests/Makefile.am endif WITH_DRIVER_MODULES PROBES_O = -@@ -409,20 +411,19 @@ +@@ -483,17 +485,15 @@ TESTS = $(test_programs) \ # Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an # intermediate shell variable, but must do all the expansion in make -lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd) - path_add = $(subst :,$(PATH_SEPARATOR),\ -- $(subst !,$(lv_abs_top_builddir)/,!daemon:!tools:!tests)) -+ $(subst !,$(PTEST_DIR)/,!daemon:!tools:!tests)) - +- VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT = \ - abs_top_builddir=$(lv_abs_top_builddir) \ @@ -52,14 +57,13 @@ Index: libvirt-1.2.4/tests/Makefile.am + abs_builddir="$(PTEST_DIR)/tests" \ + abs_srcdir="$(PTEST_DIR)/tests" \ + CONFIG_HEADER="$(PTEST_DIR)/config.h" \ - PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ SHELL="$(SHELL)" \ - LIBVIRT_DRIVER_DIR="$(lv_abs_top_builddir)/src/.libs" \ + LIBVIRT_DRIVER_DIR="$(PTEST_DIR)/src/.libs" \ LIBVIRT_AUTOSTART=0 \ LC_ALL=C \ VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ -@@ -1137,5 +1138,51 @@ +@@ -1388,5 +1388,51 @@ else ! WITH_CIL EXTRA_DIST += objectlocking.ml endif ! WITH_CIL |