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 --- .../0001-run_tests-respect-tools-dir.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch (limited to 'meta-openstack/recipes-devtools/python/python-cinder') diff --git a/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch b/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch new file mode 100644 index 0000000..02ee051 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch @@ -0,0 +1,29 @@ +From cecd4285356bdfdb36161d24b9a3a47942643077 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Wed, 11 Dec 2013 14:25:49 -0500 +Subject: [PATCH] run_tests: respect --tools-dir + +Signed-off-by: Bruce Ashfield +--- + run_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/run_tests.sh b/run_tests.sh +index 726ff438a077..f4f4d48c8808 100755 +--- a/run_tests.sh ++++ b/run_tests.sh +@@ -146,9 +146,9 @@ function run_tests { + then + # subunit-2to1 is present, testr subunit stream should be in version 2 + # format. Convert to version one before colorizing. +- bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} tools/colorizer.py" ++ bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} $tool_path/tools/colorizer.py" + else +- bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py" ++ bash -c "${wrapper} $TESTRTESTS | ${wrapper} $tool_path/tools/colorizer.py" + fi + RESULT=$? + set -e +-- +1.7.10.4 + -- cgit v1.2.3-54-g00ecf