]> code.ossystems Code Review - openembedded-core.git/commitdiff
ptest: Move ptest checks from recipes to ptest.bbclass
authorBjörn Stenberg <bjst@enea.com>
Wed, 6 Mar 2013 09:41:08 +0000 (10:41 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 7 Mar 2013 11:12:26 +0000 (11:12 +0000)
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>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/ptest.bbclass

index 131af7b0efac07261aed2ac1ded6649249b812b5..6ab5ee411f2d3f6bc8e67a8d01de18f444622c44 100644 (file)
@@ -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