diff options
Diffstat (limited to 'meta-ivi-test')
36 files changed, 985 insertions, 128 deletions
diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc new file mode 100644 index 0000000..24788c6 --- /dev/null +++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc @@ -0,0 +1,43 @@ +#!/bin/sh +get_list() { + return 6 +} + +get_title() { + echo "vSOMEIP" +} + +_run_dir=/opt/tests/vsomeip +_run() { + cd ${_run_dir} + if [ "x${2}" != "x" ]; then + ./${1}_starter.sh >& /tmp/t + tail -n 8 /tmp/t | grep -E 'PASS|FAIL' + else + ./${1}_starter.sh + fi +} + +run_1() { + _run application_test $* +} + +run_2() { + _run big_payload_test_local $* +} + +run_3() { + _run external_local_payload_test_client_local $* +} + +run_4() { + _run header_factory_test_send_receive $* +} + +run_5() { + _run local_payload_test $* +} + +run_6() { + _run local_routing_test $* +} diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend new file mode 100644 index 0000000..441fdf0 --- /dev/null +++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend @@ -0,0 +1,43 @@ +# +# for test +# +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + http://googletest.googlecode.com/files/gtest-1.7.0.zip \ + file://${BPN}_t.inc \ + " +SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7" +SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d" + +EXTRA_OECONF += " -DTEST_IP_MASTER=10.0.3.1 -DTEST_IP_SLAVE=10.0.3.125" +do_configure_prepend() { + export GTEST_ROOT=${WORKDIR}/gtest-1.7.0 +} + +do_compile_append() { + _B=`pwd` + perl -pi -e "s|-Wl,-rpath,${_B}:||" examples/CMakeFiles/*/link.txt + make examples + + perl -pi -e "s|-Wl,-rpath,${_B}||" test/CMakeFiles/*/link.txt + make build_tests +} + +do_install_append() { + install -d ${D}/opt/tests/${PN}/examples + install -m 0755 ${B}/examples/*-sample ${D}/opt/tests/${PN}/examples + for i in sh json test client service; do + cp -f ${B}/test/*${i} ${D}/opt/tests/${PN} + done + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} +} + +PACKAGES += "${PN}-test" + +FILES_${PN}-dbg += " \ + /opt/tests/${PN}/.debug/* \ + " +FILES_${PN}-test = " \ + /opt/tests/${PN} \ + " diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb b/meta-ivi-test/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb deleted file mode 100644 index 3e9c36c..0000000 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ core generator" - -LAUNCHER_BASE = "commonapi-generator" -LAUNCHER_LINK = "capicxx-core-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi-generator.zip" -SRC_URI[md5sum] = "c12551e8f61da944b17a22c00d3e6559" -SRC_URI[sha256sum] = "538a923a1e596106b9f2ce0838fcf85fd81c4e09b0951c59ad2e2e72eb6d0534" diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb b/meta-ivi-test/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb deleted file mode 100644 index 66b90a8..0000000 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ D-Bus generator" - -LAUNCHER_BASE = "commonapi-dbus-generator" -LAUNCHER_LINK = "capicxx-dbus-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_dbus_generator.zip" -SRC_URI[md5sum] = "70a6f1cf7e42a94260385281a569a486" -SRC_URI[sha256sum] = "de165298b1062951dff07d99f491c8d8a3ca3c1a087de56bc01c083cf71fa742" diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-native.inc b/meta-ivi-test/recipes-extended/common-api/capicxx-native.inc deleted file mode 100644 index 19b22e3..0000000 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-native.inc +++ /dev/null @@ -1,45 +0,0 @@ -SECTION = "devel" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = \ - "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" - -BASE_URL = "http://docs.projects.genivi.org/yamaica-update-site/CommonAPI" -BASE_VER = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" - -def get_launcher_name(d): - BS = d.getVar('BUILD_SYS', True) - if BS == "x86_64-linux": - launcherName = "${LAUNCHER_BASE}-linux-x86_64" - elif BS == "i686-linux": - launcherName = "${LAUNCHER_BASE}-linux-x86" - else: - bb.fatal("Build system '%s' is not supported by ${PN}_${PV} recipe" % BS) - return launcherName - -LAUNCHER = "${@get_launcher_name(d)}" - -inherit native -SANITY_REQUIRED_UTILITIES += "java" - -S = "${WORKDIR}" -DD = "${D}${datadir}/${PN}-${PV}" - -do_install() { - install -d ${DD} - install -m 0644 ${S}/artifacts.xml ${DD} - install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86 ${DD} - install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86.ini ${DD} - install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86_64 ${DD} - install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86_64.ini ${DD} - for dir in ./configuration ./features ./plugins; do - for item in $(find ${dir} -name '*' -print); do - if [ -d ${item} ]; then - install -d ${DD}/${item} - else - install -m 0644 ${S}/${item} ${DD}/$(dirname ${item}) - fi - done - done - install -d "${D}${bindir}" - ln -sf -T "${DD}/${LAUNCHER}" ${D}${bindir}/${LAUNCHER_LINK} -} diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc b/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc new file mode 100644 index 0000000..09199db --- /dev/null +++ b/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc @@ -0,0 +1,31 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Common API C++ test code" +} + +_run_dir=/opt/tests/capicxx-perf +_run_1() { + ${_run_dir}/capicxx-server & + ${_run_dir}/capicxx-client + kill -9 `pidof capicxx-server` + sleep 1 +} + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 >& /tmp/t + _test_completed=`cat /tmp/t | grep "test completed"` + _10000_sent=`cat /tmp/t | grep "sync messages sent" | grep 10000` + if [ "x${_test_completed}" != "x" -a "y${_10000_sent}" != "y" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-perf_git.bb b/meta-ivi-test/recipes-extended/common-api/capicxx-perf_git.bb index 2263647..f468650 100644 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-perf_git.bb +++ b/meta-ivi-test/recipes-extended/common-api/capicxx-perf_git.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = \ PR = "r0" SRCREV = "2eacc9d7fb76957e9a5450a559675fddf0a95ce2" -SRC_URI = "git://github.com/GENIVI/capic-poc.git" +SRC_URI = "git://github.com/GENIVI/capic-poc.git \ + file://${BPN}_t.inc \ + " S = "${WORKDIR}/git/test/capicxx-perf" DEPENDS = "common-api-c++ common-api-c++-dbus capicxx-core-native capicxx-dbus-native" @@ -31,4 +33,6 @@ do_install_append() { mv ${D}/usr/bin/* ${_DEST} rmdir ${D}/usr/bin rmdir ${D}/usr + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb b/meta-ivi-test/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb deleted file mode 100644 index d4eccb0..0000000 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Common API C++ SOME/IP generator" - -LAUNCHER_BASE = "commonapi-someip-generator" -LAUNCHER_LINK = "capicxx-someip-gen" - -require capicxx-native.inc - -SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_someip_generator.zip" -SRC_URI[md5sum] = "23196ec64737ea85b96aa754d17cf01c" -SRC_URI[sha256sum] = "5135d9df40a27d29f60785db9812a65395e077b3e61f3beaa15d08c6094f8e0d" diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc new file mode 100644 index 0000000..1c7cca9 --- /dev/null +++ b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc @@ -0,0 +1,36 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Common API C++ runtime" +} + +_run_dir=/opt/tests/common-api-test +_run_1() { + ${_run_dir}/E05ManagerService & + ${_run_dir}/E05ManagerClient & + sleep 5 + kill -9 `pidof E05ManagerClient` + kill -9 `pidof E05ManagerService` + sleep 1 +} + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 >& /tmp/t + _c1=`cat /tmp/t | grep "Special device 0 detected"` + _c2=`cat /tmp/t | grep "Special device 0 removed"` + _c3=`cat /tmp/t | grep "Device 1 detected"` + _c4=`cat /tmp/t | grep "Device 1 removed"` + if [ "x${_c1}" != "x" -a "x${_c2}" != "x" -a \ + "x${_c3}" != "x" -a "x${_c4}" != "x" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb b/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb index a286502..04b8154 100644 --- a/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb +++ b/meta-ivi-test/recipes-extended/common-api/common-api-test_3.1.5.bb @@ -4,12 +4,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r0" -inherit autotools cmake pkgconfig +inherit cmake pkgconfig DEPENDS += " common-api-c++ common-api-c++-dbus glib-2.0" SRC_URI = " \ file://${PN}-${PV}.tar.gz \ + file://${BPN}_t.inc \ " S = "${WORKDIR}/${PN}" @@ -22,6 +23,7 @@ FILES_${PN} = " \ /opt/tests/${PN}/*/commonapi4dbus.ini \ /opt/tests/${PN}/*/*Client \ /opt/tests/${PN}/*/*Service \ + /opt/tests/${PN}/${BPN}_t.inc \ ${libdir}/*.so \ " @@ -60,4 +62,6 @@ do_install() { fi install -m 0755 ${_BIN}/${i}/lib${i}-dbus.so ${D}${libdir} done + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } diff --git a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/0001-change-file-position-for-dlt-test-filetransfer.patch b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/0001-change-file-position-for-dlt-test-filetransfer.patch index 65be18e..44f5432 100644 --- a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/0001-change-file-position-for-dlt-test-filetransfer.patch +++ b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/0001-change-file-position-for-dlt-test-filetransfer.patch @@ -10,32 +10,32 @@ Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index 6a6a962..bd6808e 100644 +index 7f9dc52..8878919 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt -@@ -58,5 +58,5 @@ install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-us +@@ -70,5 +70,5 @@ install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-us COMPONENT base) INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png -- DESTINATION /usr/share/dlt-filetransfer +- DESTINATION share/dlt-filetransfer + DESTINATION /opt/tests/dlt-daemon/data ) diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c -index 14b69e4..589926f 100644 +index 591714a..2a2fd1a 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c -@@ -362,9 +362,9 @@ int testFile3Run3(){ +@@ -369,9 +369,9 @@ int testFile3Run3(){ int main(void) { - //First file contains some text -- file1 = "/usr/share/dlt-filetransfer/dlt-test-filetransfer-file"; -+ file1 = "/opt/tests/dlt-daemon/data/dlt-test-filetransfer-file"; - //Second file is a picture -- file2 = "/usr/share/dlt-filetransfer/dlt-test-filetransfer-image.png"; -+ file2 = "/opt/tests/dlt-daemon/data/dlt-test-filetransfer-image.png"; - //Third file doesn't exist. Just to test the reaction when the file isn't available. - file3_1 = "dlt-test-filetransfer-doesntExist_1"; - //Third file doesn't exist. Just to test the reaction when the file isn't available. + //First file contains some text +- file1 = "/usr/local/share/dlt-filetransfer/dlt-test-filetransfer-file"; ++ file1 = "/opt/tests/dlt-daemon/data/dlt-test-filetransfer-file"; + //Second file is a picture +- file2 = "/usr/local/share/dlt-filetransfer/dlt-test-filetransfer-image.png"; ++ file2 = "/opt/tests/dlt-daemon/data/dlt-test-filetransfer-image.png"; + //Third file doesn't exist. Just to test the reaction when the file isn't available. + file3_1 = "dlt-test-filetransfer-doesntExist_1"; + //Third file doesn't exist. Just to test the reaction when the file isn't available. -- 1.9.1 diff --git a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc new file mode 100644 index 0000000..ab96fa0 --- /dev/null +++ b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc @@ -0,0 +1,37 @@ +#!/bin/sh +get_list() { + return 2 +} + +get_title() { + echo "dlt-daemon" +} + +_run_dir=/opt/tests/dlt-daemon +run_1() { + if [ "x${1}" != "x" ]; then + ${_run_dir}/dlt-test-filetransfer > /tmp/t + _c1=$? + if [ "x${_c1}" = "x0" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + ${_run_dir}/dlt-test-filetransfer + fi +} + +run_2() { + if [ "x${1}" != "x" ]; then + ${_run_dir}/dlt-test-user > /tmp/t + _c1=`cat /tmp/t | grep -v -E Test.. | grep -v "locally printed"` + if [ "x${_c1}" = "x" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + ${_run_dir}/dlt-test-user + fi +} diff --git a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend index 8b50f89..4f6af19 100644 --- a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend +++ b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon_%.bbappend @@ -4,6 +4,7 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append += " \ file://0001-change-file-position-for-dlt-test-filetransfer.patch \ + file://${BPN}_t.inc \ " EXTRA_OECMAKE += "-DWITH_DLTTEST=ON -DCMAKE_SKIP_RPATH=ON -DWITH_MAN=OFF" @@ -12,15 +13,12 @@ do_install_append() { _BIN=${WORKDIR}/build/src/tests install -d ${D}/opt/tests/${PN}/data install -m 0755 ${_BIN}/dlt-test-* ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" DEPENDS_${PN}-test = "${PN}" -FILES_${PN}-dbg += " \ - /opt/tests/${PN}/.debug/* \ - " -FILES_${PN}-test = " \ - /opt/tests/${PN}/dlt-test* \ - /opt/tests/${PN}/data/* \ - " +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc new file mode 100644 index 0000000..2afbc92 --- /dev/null +++ b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc @@ -0,0 +1,45 @@ +#!/bin/sh +get_list() { + return 2 +} + +get_title() { + echo "Node Health Monitor" +} + +_run_dir=/opt/tests/node-health-monitor +_run_() { + systemctl start nsm-dummy + node-health-monitor & + + cd ${_run_dir} + ./${1} + + kill -9 `pidof node-health-monitor` + systemctl stop nsm-dummy +} + +_run() { + echo "[ FAILED ] node-head-monitor is not working properly" + return 0 + + if [ "x${2}" != "x" ]; then + _run_ $1 > /tmp/t 2> /tmp/t.err + _c1=$? + if [ "x${_c1}" = "x0" ]; then + echo "[ PASSED ]" + else + echo "[ FAILED ]" + fi + else + _run_ $1 2> /tmp/t.err + fi +} + +run_1() { + _run nhm-main-test $* +} + +run_2() { + _run nhm-systemd-test $* +} diff --git a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend index fa2055a..fbe0ad1 100644 --- a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend +++ b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend @@ -1,6 +1,11 @@ # # for test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " + do_compile_append() { make -C tst nhm-main-test make -C tst nhm-systemd-test @@ -11,6 +16,8 @@ do_install_append() { install -m 0755 ${S}/tst/nhm-main-test ${D}/opt/tests/${PN} install -m 0755 ${S}/tst/nhm-systemd-test ${D}/opt/tests/${PN} ln -s /etc ${D}/opt/tests/cfg + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" @@ -20,6 +27,6 @@ FILES_${PN}-dbg += " \ /opt/tests/${PN}/.debug/* \ " FILES_${PN}-test = " \ - /opt/tests/${PN}/* \ + /opt/tests/${PN}/ \ /opt/tests/cfg \ " diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc new file mode 100644 index 0000000..6516461 --- /dev/null +++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc @@ -0,0 +1,69 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Node Startup Controller" +} + +_run_dir=/opt/tests/node-startup-controller +_luc_check() { + while true; do + ${_run_dir}/luc_check.sh > /tmp/t + is_nsc=`grep LUC is not required` + if [ "x${is_nsc}" != "x" ]; then + echo "restart node-startup-controller" + systemctl stop node-startup-controller + sleep 1 + systemctl start node-startup-controller + else + break + fi + done +} +_run_() { + systemctl start dlt-receive + systemctl start nsm-dummy + systemctl start node-startup-controller + + _luc_check + ${_run_dir}/${1} + + systemctl stop node-startup-controller + systemctl stop nsm-dummy + #systemctl stop dlt-receive +} + +_check_luc_test_01() { + cat /tmp/t | grep 'NSC-' | grep 'CTRL' > /tmp/t2 + _c1=`cat /tmp/t2 | grep "Updated LUC to:" | grep app1.unit` + _c2=`cat /tmp/t2 | grep "\[Starting LUC group: 0\]"` + _c3=`cat /tmp/t2 | grep "\[Starting LUC app: app1.unit\]"` + _c4=`cat /tmp/t2 | grep "\[Finished starting LUC app: app1.unit\]"` + _c5=`cat /tmp/t2 | grep "\[Finished starting LUC group: 0\]"` + if [ "x${_c1}" != "x" -a "x${_c2}" != "x" -a "x${_c3}" != "x" -a \ + "x${_c4}" != "x" -a "x${_c5}" != "x" ]; then + echo "[ PASSED ]" + else + echo "[ FAILED ]" + fi +} + +_run() { + if [ "x${2}" != "x" ]; then + _run_ ${1}.sh > /tmp/t 2> /tmp/t.err + eval _check_${1} + else + _run_ ${1}.sh 2> /tmp/t.err + fi +} + +run_1() { + _run luc_test_01 $* + +} + +run_2() { + _run nhm-systemd-test $* +} diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend index c9ccacc..1d8e2a1 100644 --- a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend +++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend @@ -4,16 +4,19 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append += " \ file://helper.zip \ + file://${BPN}_t.inc \ " do_install_append() { install -d ${D}/opt/tests/${PN} install -m 0755 ${WORKDIR}/helper/*.sh ${D}/opt/tests/${PN} install -m 0644 ${WORKDIR}/helper/*.service ${D}/${systemd_unitdir}/system + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } FILES_${PN}-nsm-dummy += " \ - /opt/tests/${PN}/* \ + /opt/tests/${PN}/ \ ${systemd_unitdir}/system/example.service \ ${systemd_unitdir}/system/hello.service \ " diff --git a/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc new file mode 100644 index 0000000..8de5959 --- /dev/null +++ b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc @@ -0,0 +1,64 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Node State Manager" +} + +_run_dir=/opt/tests/node-state-manager +_run_1() { + ${_run_dir}/NodeStateTest +} + +_setup_env() { + systemctl stop node-startup-controller + + _p=`pidof NodeStateManager` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi + _p=`pidof nsm-dummy` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi +} + +_lib=/usr/lib/libNodeStateMachineStub.so +_lib_2=/usr/lib/libNodeStateMachineTest.so +_lib_t=${_run_dir}/lib/libNodeStateMachineTest.so +_lib_bak=${_run_dir}/lib/libNodeStateMachineStub.so +run_1() { + if [ ! -f ${_lib_bak} ]; then + cp ${_lib} ${_run_dir}/lib + fi + cp ${_lib_t} ${_lib} + ldconfig + sleep 1 + + _setup_env + /usr/bin/NodeStateManager >& /dev/null & + sleep 2 + + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t 2> /tmp/t.err + _c1=`cat /tmp/t | grep success | wc -l` + _c2=`cat /tmp/t | grep failed | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 2> /tmp/t.err + fi + + _setup_env + + rm -f ${_lib} ${_lib_2} + cp ${_lib_bak} ${_lib} + ldconfig +} diff --git a/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager_%.bbappend b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager_%.bbappend index e8e8a2b..a35ecc5 100644 --- a/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager_%.bbappend +++ b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager_%.bbappend @@ -1,13 +1,24 @@ # # for test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " + +do_compile_append() { + make -C NodeStateMachineTest +} + do_install_append() { install -d ${D}/opt/tests/${PN}/lib - install -m 0755 ${S}/NodeStateTest/NodeStateTest ${D}/opt/tests/${PN} - install -m 0644 ${S}/NodeStateTest/org.genivi.NodeStateMachineTest.xml \ + install -m 0755 ${S}/NodeStateMachineTest/NodeStateTest ${D}/opt/tests/${PN} + install -m 0644 ${S}/NodeStateMachineTest/org.genivi.NodeStateMachineTest.xml \ ${D}${datadir}/dbus-1/interfaces/ - install -m 0755 ${S}/NodeStateTest/.libs/libNodeStateMachineTest.so \ + install -m 0755 ${S}/NodeStateMachineTest/.libs/libNodeStateMachineTest.so \ ${D}/opt/tests/${PN}/lib + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" @@ -18,7 +29,7 @@ FILES_${PN}-dbg += " \ /opt/tests/${PN}/lib/.debug/* \ " FILES_${PN}-test = " \ - /opt/tests/${PN}/* \ + /opt/tests/${PN}/ \ /opt/tests/${PN}/lib/libNodeStateMachineTest.so \ ${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml \ " diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc new file mode 100644 index 0000000..d9ff540 --- /dev/null +++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc @@ -0,0 +1,44 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "persistence-administrator" +} + +_run_dir=/opt/tests/persistence-administrator +_run_1() { + persadmin_tool install /Data/Data.tar.gz > /tmp/t + ${_run_dir}/pers_admin_test_framework +} + +run_1() { + echo "[ FAILED ] segfault at 7fa2ac0b6010 ip 000000364d88e130 sp 00007fa2ae0f2aa8 error 4 in libc-2.23.so[364d800000+197000]" + return 0 + + if [ ! -d /tmp/PAS ]; then + rm -f /tmp/PAS + mkdir -p /tmp/PAS + fi + cp ${_run_dir}/resource*.tar.gz /tmp/PAS/ + + systemctl restart dlt-dbus + systemctl restart dlt-example-user + systemctl restart pas-daemon + systemctl restart node-startup-controller + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend index c1cc200..13bcb3d 100644 --- a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend +++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend @@ -1,22 +1,28 @@ # # test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " file://${BPN}_t.inc \ + " + do_install_append() { install -d ${D}/opt/tests/${PN} mv ${S}/test/pers_svc_test/.libs/pers_admin_test_framework \ ${D}/opt/tests/${PN} - install -d ${D}/Data + install -m 0644 ${S}/test/pers_svc_test/webtool_export/resource1.tar.gz \ + ${D}/opt/tests/${PN} install -m 0644 ${S}/test/pers_svc_test/webtool_export/resource2.tar.gz \ - ${D}/Data + ${D}/opt/tests/${PN} + install -d ${D}/Data/mnt-wt/ + touch ${D}/Data/mnt-wt/README.wt + install -d ${D}/Data/mnt-c/ + touch ${D}/Data/mnt-wt/README.c + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" DEPENDS_${PN}-test = "${PN}" -FILES_${PN}-dbg += " \ - /opt/tests/${PN}/.debug/* \ - " -FILES_${PN}-test = " \ - /opt/tests/${PN}/* \ - /Data/resource2.tar.gz \ - " +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ /Data/* " diff --git a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc new file mode 100644 index 0000000..d39149c --- /dev/null +++ b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc @@ -0,0 +1,46 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "persisitence-client-library" +} + +_run_dir=/opt/tests/persistence-client-library +_run_1() { + persadmin_tool install /Data/Data.tar.gz > /tmp/t + ${_run_dir}/persistence_client_library_test +} + +_setup_env() { + _p=`pidof NodeStateManager` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi + _p=`pidof nsm-dummy` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi + + systemctl restart pas-daemon +} + +run_1() { + _setup_env + + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend index 58f2aa3..963f5fc 100644 --- a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend +++ b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library_%.bbappend @@ -1,6 +1,10 @@ # # for test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " file://${BPN}_t.inc \ + " + EXTRA_OECONF += "--enable-tests" do_install_append() { @@ -10,15 +14,14 @@ do_install_append() { install -d ${D}/Data install -m 0644 ${S}/test/data/PAS_data.tar.gz \ ${D}/Data/Data.tar.gz + install -d ${D}/Data/mnt-c/lt-persistence_client_library_test + touch ${D}/Data/mnt-c/lt-persistence_client_library_test/BLANK + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" DEPENDS_${PN}-test = "${PN}" -FILES_${PN}-dbg += " \ - /opt/tests/${PN}/.debug/* \ - " -FILES_${PN}-test = " \ - /opt/tests/${PN}/persistence_client_library_test \ - /Data/Data.tar.gz \ - " +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ /Data/* " diff --git a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc new file mode 100644 index 0000000..bd45a3b --- /dev/null +++ b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc @@ -0,0 +1,30 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "persisitence-common-object" +} + +_run_dir=/opt/tests/persistence-common-object +_run_1() { + ${_run_dir}/test_pco_key_value_store +} + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend index 6dc26d4..dbc65bb 100644 --- a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend +++ b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object_%.bbappend @@ -1,21 +1,22 @@ # # for test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " file://${BPN}_t.inc \ + " + EXTRA_OECONF += "--enable-tests" do_install_append() { install -d ${D}/opt/tests/${PN} install -m 0755 ${S}/test/.libs/test_pco_key_value_store \ ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" RDEPENDS_${PN}-test += " libcheck" -FILES_${PN}-dbg += " \ - /opt/tests/${PN}/.debug/* \ - " - -FILES_${PN}-test = " \ - /opt/tests/${PN}/test_pco_key_value_store \ - " +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc new file mode 100644 index 0000000..ea9b942 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc @@ -0,0 +1,46 @@ +#!/bin/sh +get_list() { + return 7 +} + +get_title() { + echo "audiomanager" +} + +_run_dir=/opt/tests/audiomanager +_run() { + if [ "x${2}" != "x" ]; then + ${_run_dir}/$1 > /tmp/t + tail /tmp/t | grep -E 'PASS|FAIL' + else + ${_run_dir}/$1 + fi +} + +run_1() { + _run AmControlInterfaceTest $* +} + +run_2() { + _run AmMapHandlerTest $* +} + +run_3() { + _run AmRouterMapTest $* +} + +run_4() { + _run AmRouterTest $* +} + +run_5() { + _run AmRoutingInterfaceTest $* +} + +run_6() { + _run AmSocketHandlerTest $* +} + +run_7() { + _run AmTelnetServerTest $* +} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend index e6b91a5..ba56fef 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend @@ -1,3 +1,7 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF" EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \ @@ -13,9 +17,11 @@ do_install_append() { install -m 0755 ${i} ${D}/opt/tests/${PN} done install -m 0755 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += " ${PN}-test" FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " -FILES_${PN}-test = "/opt/tests/${PN}/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend new file mode 100644 index 0000000..0647b46 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend @@ -0,0 +1,28 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " + +EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF" +EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \ + -DTEST_EXECUTABLE_INSTALL_PATH=/opt/tests/${PN}/ \ + -Dgmock_build_tests=ON -Dgtest_build_samples=ON -Dgtest_build_tests=ON \ + -DCMAKE_SKIP_RPATH=ON \ + " + +DEPENDS += "gtest gmock" + +do_install_append() { + mkdir -p ${D}/opt/tests/${PN} + + for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do + install -m 0755 ${i} ${D}/opt/tests/${PN} + done + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} +} + +PACKAGES += " ${PN}-test" + +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc new file mode 100644 index 0000000..a4111e3 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc @@ -0,0 +1,34 @@ +#!/bin/sh +get_list() { + return 4 +} + +get_title() { + echo "audiomanagerplugins" +} + +_run_dir=/opt/tests/audiomanagerplugins +_run() { + if [ "x${2}" != "x" ]; then + ${_run_dir}/$1 > /tmp/t + tail /tmp/t | grep -E 'PASS|FAIL' + else + ${_run_dir}/$1 + fi +} + +run_1() { + _run AmCommandSenderCAPITest $* +} + +run_2() { + _run AmControlReceiverShadowTest $* +} + +run_3() { + _run AmRoutingInterfaceCAPITests $*s +} + +run_4() { + _run AmRoutingReceiveAsyncTest $* +} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc new file mode 100644 index 0000000..d72db30 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc @@ -0,0 +1,38 @@ +#!/bin/sh +get_list() { + return 5 +} + +get_title() { + echo "audiomanagerplugins" +} + +_run_dir=/opt/tests/audiomanagerplugins +_run() { + if [ "x${2}" != "x" ]; then + ${_run_dir}/$1 > /tmp/t + tail /tmp/t | grep -E 'PASS|FAIL' + else + ${_run_dir}/$1 + fi +} + +run_1() { + _run AmCommandSenderCAPITest $* +} + +run_2() { + _run AmCommandSenderDbusSignalTest $* +} + +run_3() { + _run AmCommandSenderDbusTest $*s +} + +run_4() { + _run AmRoutingInterfaceCAPITests $* +} + +run_5() { + _run AmRoutingReceiveAsyncTest $* +} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch new file mode 100644 index 0000000..9386af2 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch @@ -0,0 +1,95 @@ +diff --git a/PluginCommandInterfaceCAPI/CMakeLists.txt b/PluginCommandInterfaceCAPI/CMakeLists.txt +index a5ec2fc..5e8e4fe 100644 +--- a/PluginCommandInterfaceCAPI/CMakeLists.txt ++++ b/PluginCommandInterfaceCAPI/CMakeLists.txt +@@ -31,12 +31,6 @@ if (NOT DAEMONVERSION) + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + +- if(WITH_TESTS) +- if(NOT TARGET gtest) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif(NOT TARGET gtest) +- endif(WITH_TESTS) +- + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) + message(FATAL_ERROR "Could not find audiomanager cmake configuration") +diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt +index 225fdc6..d6ef7e8 100644 +--- a/PluginCommandInterfaceDbus/CMakeLists.txt ++++ b/PluginCommandInterfaceDbus/CMakeLists.txt +@@ -26,11 +26,6 @@ if (NOT DAEMONVERSION) + include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +- if(WITH_TESTS) +- if(NOT TARGET gtest) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif() +- endif(WITH_TESTS) + + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) +diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt +index 137ca8f..53d71f3 100644 +--- a/PluginControlInterface/CMakeLists.txt ++++ b/PluginControlInterface/CMakeLists.txt +@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION) + include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +- if(WITH_TESTS) +- if(NOT TARGET gtest) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif() +- endif(WITH_TESTS) + + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) +diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt +index 85a7a04..010b7ee 100644 +--- a/PluginRoutingInterfaceAsync/CMakeLists.txt ++++ b/PluginRoutingInterfaceAsync/CMakeLists.txt +@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION) + include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +- if(WITH_TESTS) +- if(NOT TARGET gtest) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif() +- endif(WITH_TESTS) + + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) +diff --git a/PluginRoutingInterfaceCAPI/CMakeLists.txt b/PluginRoutingInterfaceCAPI/CMakeLists.txt +index 7b4b1af..bf52e4a 100644 +--- a/PluginRoutingInterfaceCAPI/CMakeLists.txt ++++ b/PluginRoutingInterfaceCAPI/CMakeLists.txt +@@ -30,11 +30,6 @@ if (NOT DAEMONVERSION) + include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +- if(WITH_TESTS) +- if(NOT TARGET gtest) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif() +- endif(WITH_TESTS) + + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) +diff --git a/PluginRoutingInterfaceDBus/CMakeLists.txt b/PluginRoutingInterfaceDBus/CMakeLists.txt +index e08b591..09a0696 100644 +--- a/PluginRoutingInterfaceDBus/CMakeLists.txt ++++ b/PluginRoutingInterfaceDBus/CMakeLists.txt +@@ -26,9 +26,6 @@ if (NOT DAEMONVERSION) + include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") + set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) + set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +- if(WITH_TESTS) +- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) +- endif(WITH_TESTS) + + set(COMMONAPI_DBUS_CONFIGURATIONS "") + else(AUDIOMANAGER_FOUND) diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend new file mode 100644 index 0000000..cda5a2c --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend @@ -0,0 +1,22 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://remove_add_gmock.patch \ + file://${BPN}_t-${PV}.inc \ + " + +EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF" +EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON" + +DEPENDS += "gtest gmock" + +do_install_append() { + make plugin-test-install + mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc +} + +PACKAGES += " ${PN}-test" + +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend new file mode 100644 index 0000000..356808c --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend @@ -0,0 +1,20 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t-${PV}.inc \ + " + +EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF" +EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON" + +DEPENDS += "gtest gmock" + +do_install_append() { + mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN} + + install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc +} + +PACKAGES += " ${PN}-test" + +FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " +FILES_${PN}-test = "/opt/tests/${PN}/ " diff --git a/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb new file mode 100644 index 0000000..909182d --- /dev/null +++ b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb @@ -0,0 +1,20 @@ +require recipes-yocto-ivi/images/ivi-image.bb + +PV = "${DATE}" + +IMAGE_INSTALL_append += " openssh test-fw \ + audiomanager-test audiomanagerplugins-test \ + common-api-test capicxx-perf \ + persistence-client-library-test \ + persistence-common-object-test \ + persistence-administrator-test \ + dlt-daemon-test \ + node-state-manager-test \ + node-health-monitor-test \ + bluez5-noinst-tools bluez5-test \ + node-startup-controller-nsm-dummy glib-2.0-utils \ + vsomeip-test \ + wayland-ivi-extension-test \ + " + +EXTRA_USERS_PARAMS = "" diff --git a/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh new file mode 100755 index 0000000..b2f4c3e --- /dev/null +++ b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# create dbus-session +dbus_live_p() { + dbus-send --bus=$1 \ + --dest=org.freedesktop.DBus --type=method_call --print-reply \ + /org/freedesktop/DBus org.freedesktop.DBus.ListNames > /tmp/dbus_check +} + +if [ -f /tmp/dbus_test-fw ]; then + _bus_str=`grep -r DBUS_SESSION_BUS_ADDRESS /tmp/dbus_test-fw` + _bus_addr=`echo ${_bus_str} | awk -F_BUS_ADDRESS= '{print $2}'` + dbus_live_p ${_bus_addr} + _dbus_live_p=`grep "method return" /tmp/dbus_check` + if [ "x${_dbus_live_p}" = "x" ]; then + dbus-launch >& /tmp/dbus_test-fw + fi +else + dbus-launch >& /tmp/dbus_test-fw +fi +export `grep -r DBUS_SESSION_BUS_ADDRESS /tmp/dbus_test-fw` + +test_list=`ls /opt/tests/*/*_t.inc | awk -F/ '{print $4}' | awk -F_t '{print $1}'` + +_test_run() { + n=$1 + echo "##########" + get_title + echo "##########" + + if [ "x${n}" = "x" ]; then + get_list + cnt=$? + echo "[ number of tests:" $cnt "]" + for k in `seq $cnt`; do + echo -n "[" run_${k} "]" + eval run_${k} "no_verbose_output" + done + else + echo "[" run_${n} "]" + eval run_${n} + fi +} + +if [ "x$1" = "xhelp" ]; then + echo "$0" + echo " - run all test" + echo "" + echo "$0 list" + echo " - list all test program" + echo "" + echo "$0 <name>" + echo " - run all sequence of test <name>" + echo "" + echo "$0 <name> <no>" + echo " - run sequence <no> of test <name>" + echo "" + exit 0 +fi + +for i in $test_list; do + j="/opt/tests/${i}/${i}_t.inc" + . $j + + if [ "x$1" != "x" ]; then + if [ "$1" = "list" ]; then + get_list + cnt=$? + echo $i $cnt + elif [ "${1}" = "${i}" ]; then + _test_run $2 + break + fi + continue; + fi + _test_run + sleep 2 +done diff --git a/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw_0.1.bb b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw_0.1.bb new file mode 100644 index 0000000..561cb32 --- /dev/null +++ b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw_0.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Simple Test script for meta-ivi" +DESCRIPTION = "This component provides a simple test framework for testing meta-ivi s/w" +HOMEPAGE = "https://github.com/GENIVI/meta-ivi" +SECTION = "test" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +SRC_URI = "file://test-fw.sh \ + " + +do_compile() { +} + +do_install() { + install -d ${D}/opt/tests/ + install -m 0755 ${WORKDIR}/test-fw.sh ${D}/opt/tests/ +} + +FILES_${PN} += " \ + /opt/tests/ \ + " |