diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/ptest.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index ec10f80e68..e5bbb89ade 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass | |||
@@ -18,9 +18,7 @@ do_configure_ptest() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | do_configure_ptest_base() { | 20 | do_configure_ptest_base() { |
21 | if [ ${PTEST_ENABLED} = 1 ]; then | 21 | do_configure_ptest |
22 | do_configure_ptest | ||
23 | fi | ||
24 | } | 22 | } |
25 | 23 | ||
26 | do_compile_ptest() { | 24 | do_compile_ptest() { |
@@ -28,9 +26,7 @@ do_compile_ptest() { | |||
28 | } | 26 | } |
29 | 27 | ||
30 | do_compile_ptest_base() { | 28 | do_compile_ptest_base() { |
31 | if [ ${PTEST_ENABLED} = 1 ]; then | 29 | do_compile_ptest |
32 | do_compile_ptest | ||
33 | fi | ||
34 | } | 30 | } |
35 | 31 | ||
36 | do_install_ptest() { | 32 | do_install_ptest() { |
@@ -38,14 +34,12 @@ do_install_ptest() { | |||
38 | } | 34 | } |
39 | 35 | ||
40 | do_install_ptest_base() { | 36 | do_install_ptest_base() { |
41 | if [ ${PTEST_ENABLED} = 1 ]; then | 37 | if [ -f ${WORKDIR}/run-ptest ]; then |
42 | if [ -f ${WORKDIR}/run-ptest ]; then | 38 | install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest |
43 | install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest | 39 | if grep -q install-ptest: Makefile; then |
44 | if grep -q install-ptest: Makefile; then | 40 | oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest |
45 | oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest | ||
46 | fi | ||
47 | do_install_ptest | ||
48 | fi | 41 | fi |
42 | do_install_ptest | ||
49 | fi | 43 | fi |
50 | } | 44 | } |
51 | 45 | ||
@@ -58,4 +52,9 @@ addtask install_ptest_base after do_install before do_package do_populate_sy | |||
58 | python () { | 52 | python () { |
59 | if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): | 53 | if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): |
60 | d.setVarFlag('do_install_ptest_base', 'fakeroot', 1) | 54 | d.setVarFlag('do_install_ptest_base', 'fakeroot', 1) |
55 | |||
56 | # Remove all '*ptest_base' tasks when ptest is not enabled | ||
57 | if not(d.getVar('PTEST_ENABLED', True) == "1"): | ||
58 | for i in filter(lambda k: d.getVarFlag(k, "task") and k.endswith("ptest_base"), d.keys()): | ||
59 | bb.build.deltask(i, d) | ||
61 | } | 60 | } |