Patchwork [1/4] ptest: Move ptest checks from recipes to ptest.bbclass

login
register
mail settings
Submitter Björn Stenberg
Date March 6, 2013, 9:41 a.m.
Message ID <1362562871-16878-2-git-send-email-bjst@enea.com>
Download mbox | patch
Permalink /patch/45591/
State Accepted
Commit bb498369b8393a88968eaad2714b18afd29c0d1e
Headers show

Comments

Björn Stenberg - March 6, 2013, 9:41 a.m.
This patch cleans up ptest implementation in recipes by moving ptest
specific code parts into dedicated *_ptest functions.

Signed-off-by: Björn Stenberg <bjst@enea.com>
---
 meta/classes/ptest.bbclass |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 131af7b..6ab5ee4 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -23,13 +23,36 @@  FILES_${PN}-dbg += "${PTEST_PATH}/.debug \
                     ${PTEST_PATH}/*/*/*/*/.debug \
                    "
 
-ptest_do_install() {
-    if [ "${PN}" = "${BPN}" -a ${PTEST_ENABLED} = "1" ]; then
-        install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
-        if grep -q install-ptest: Makefile; then
-            oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
+do_configure_ptest_base() {
+    if [ ${PTEST_ENABLED} = 1 ]; then
+        if [ type -t do_configure_ptest = function ]; then
+            do_configure_ptest
         fi
     fi
 }
 
-EXPORT_FUNCTIONS ptest_do_install
+do_compile_ptest_base() {
+    if [ ${PTEST_ENABLED} = 1 ]; then
+        if [ type -t do_compile_ptest = function ]; then
+            do_compile_ptest
+        fi
+    fi
+}
+
+do_install_ptest_base() {
+    if [ ${PTEST_ENABLED} = 1 ]; then
+        if [ -f ${WORKDIR}/run-ptest ]; then
+            install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
+            if grep -q install-ptest: Makefile; then
+                oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
+            fi
+            if [ type -t do_install_ptest = function ]; then
+                do_install_ptest
+            fi
+        fi
+    fi
+}
+
+addtask configure_ptest_base after do_configure before do_compile
+addtask compile_ptest_base   after do_compile   before do_install
+addtask install_ptest_base   after do_install   before do_package