From 8e8bcf786654231916f85b45aa32a56dae222f71 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 11 Dec 2013 15:07:17 -0500 Subject: cinder: modify run_tests to respect --tools-dir Since the "tools" subdir of cinder is only packaged and installed in /etc/cinder, we need to use --tools-dir to point the test script in the right direction. Unfortunately, run_tests.sh takes this arg and ignores it. So we patch the script to actually respect the directory. Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-cinder_git.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-openstack/recipes-devtools/python/python-cinder_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 50eacaa..c441828 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -11,6 +11,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://cinder.conf \ file://cinder.init \ file://cinder-volume \ + file://0001-run_tests-respect-tools-dir.patch \ " SRCREV="1f99a044580286bf0d927cc7fc7ce3378653aef0" @@ -48,7 +49,9 @@ do_install_append() { install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume fi + # test setup cp run_tests.sh ${CINDER_CONF_DIR} + cp -r tools ${CINDER_CONF_DIR} } pkg_postinst_${SRCNAME}-setup () { @@ -75,7 +78,8 @@ ALLOW_EMPTY_${SRCNAME}-setup = "1" FILES_${PN} = "${libdir}/*" -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" +FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \ + ${sysconfdir}/${SRCNAME}/tools" FILES_${SRCNAME}-api = "${bindir}/cinder-api \ ${sysconfdir}/init.d/cinder-api" -- cgit v1.2.3-54-g00ecf