From 952a788d17e08031848d9cea07f689c4a14b3a8a Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Thu, 9 Feb 2017 03:27:59 +0000 Subject: multiprocmgr-test: Add test c66x images, sources and scripts to package multiprocmgr-test installs source files, host binaries and associated scripts (ti/examples/mpm/test) multiprocmgr-rtos-test installs the C66x test images in the same directory structure. Other updates include - Use of oe_runmake instead of make - Added runtime dependency of multiprocmgr-rtos-test & bash Signed-off-by: Sam Nelson Signed-off-by: Denys Dmytriyenko --- recipes-ti/multiprocmgr/multiprocmgr-rtos_git.bb | 24 +++++++++++++++++++----- recipes-ti/multiprocmgr/multiprocmgr-test_git.bb | 21 ++++++++++++++++----- 2 files changed, 35 insertions(+), 10 deletions(-) (limited to 'recipes-ti') diff --git a/recipes-ti/multiprocmgr/multiprocmgr-rtos_git.bb b/recipes-ti/multiprocmgr/multiprocmgr-rtos_git.bb index 061790b2..c88f0d7f 100644 --- a/recipes-ti/multiprocmgr/multiprocmgr-rtos_git.bb +++ b/recipes-ti/multiprocmgr/multiprocmgr-rtos_git.bb @@ -6,22 +6,36 @@ require recipes-ti/multiprocmgr/multiprocmgr.inc DEPENDS = "ti-cgt6x-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -export LOCAL_SYSROOT="${STAGING_DIR_TARGET}" -export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" +PACKAGES =+ "${PN}-test" +FILES_${PN}-test = "${datadir}/ti/examples/mpm/test/filetestdemo/c66x/demo_loopback/build/bin/*.out \ + ${datadir}/ti/examples/mpm/test/sync_test/c66x/bin/*.out" + +EXTRA_OEMAKE = "LOCAL_SYSROOT="${STAGING_DIR_TARGET}" \ + C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ + " do_compile() { - make c66x - make test_c66x + oe_runmake c66x + oe_runmake test_c66x } do_install() { install -d ${D}${MPM_INSTALL_DIR_RECIPE} cp -pPrf ${S}/* ${D}${MPM_INSTALL_DIR_RECIPE} + + # Copy C66x binaries + install -d ${D}${datadir}/ti/examples/mpm/test/filetestdemo/c66x/demo_loopback/build/bin + cp ${S}/test/filetestdemo/c66x/demo_loopback/build/bin/*.out \ + ${D}${datadir}/ti/examples/mpm/test/filetestdemo/c66x/demo_loopback/build/bin/ + install -d ${D}${datadir}/ti/examples/mpm/test/sync_test/c66x/bin + cp ${S}/test/sync_test/c66x/bin/*.out \ + ${D}${datadir}/ti/examples/mpm/test/sync_test/c66x/bin/ } FILES_${PN}-dev += "${MPM_INSTALL_DIR_RECIPE}" INSANE_SKIP_${PN}-dev = "arch" +INSANE_SKIP_${PN}-test = "arch" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb b/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb index 7ec8796e..f01d6513 100644 --- a/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb +++ b/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb @@ -2,22 +2,33 @@ DESCRIPTION = "TI Multiproc Manager test code" include multiprocmgr.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" DEPENDS = "multiprocmgr cmem" RDEPENDS_${PN} = "multiprocmgr mpm-transport cmem" +RDEPENDS_${PN} += "multiprocmgr-rtos-test bash" CC += "-I${STAGING_KERNEL_DIR}/include" # Assuming the multiprocmgr kernel API is safe CC[vardepsexclude] = "STAGING_KERNEL_DIR" +FILES_${PN} += "\ + ${datadir}/ti/examples/mpm \ +" + +FILES_${PN}-dbg += "\ + ${datadir}/ti/examples/mpm/*/.debug \ +" + do_compile() { - make -C ${S} test + oe_runmake -C ${S} test } do_install() { - install -d ${D}${bindir}/ - install -c -m 755 ${S}/test/filetestdemo/host/bin/demo_filetest ${D}${bindir}/mpm_demo_filetest - install -c -m 755 ${S}/test/sync_test/host/bin/sync_test ${D}${bindir}/mpm_sync_test + # Copy Sources and binary + install -d ${D}${datadir}/ti/examples/mpm/src + cp -r ${S}/src/mailbox ${D}${datadir}/ti/examples/mpm/src + cp -r ${S}/src/sync ${D}${datadir}/ti/examples/mpm/src + cp -r ${S}/test ${D}${datadir}/ti/examples/mpm } -- cgit v1.2.3-54-g00ecf