From 67667b0f4448431c0e31bda576aa1ddc9ba6a1df Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Fri, 12 Mar 2021 12:25:21 +0100 Subject: [PATCH] unittests: Fix CPPUTEST path not set when building CCPUTEST_HOME was only set when trying to run the unit tests. But it was already required when building first the tool. BugzID: 69904 --- classes/unittests.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/unittests.bbclass b/classes/unittests.bbclass index 0368ec3..49068c3 100644 --- a/classes/unittests.bbclass +++ b/classes/unittests.bbclass @@ -2,16 +2,16 @@ DEPENDS_class-target += "${PN}-native" DEPENDS_class-native += "cpputest" -BUILD_CFLAGS +="-I${CPPUTEST_HOME}/include" -BUILD_CPPFLAGS +="-I${CPPUTEST_HOME}/include" +export CPPUTEST_HOME="${base_prefix}/usr/lib/cpputest/" +export BUILD_CFLAGS +="-I${CPPUTEST_HOME}/include" +export BUILD_CPPFLAGS +="-I${CPPUTEST_HOME}/include" +export CPPUTEST_ADDITIONAL_CFLAGS=" ${BUILD_CFLAGS}" +export CPPUTEST_ADDITIONAL_CPPFLAGS=" ${BUILD_CPPFLAGS}" +export CPPUTEST_ADDITIONAL_CXXFLAGS=" ${BUILD_CXXFLAGS}" +export CPPUTEST_ADDITIONAL_LDFLAGS=" ${BUILD_LDFLAGS}" do_compile_append_class-native() { bbplain "building UNIT TEST ${BPN}..." - export CPPUTEST_HOME="${base_prefix}/usr/lib/cpputest/" - export CPPUTEST_ADDITIONAL_CFLAGS=" ${BUILD_CFLAGS}" - export CPPUTEST_ADDITIONAL_CPPFLAGS=" ${BUILD_CPPFLAGS}" - export CPPUTEST_ADDITIONAL_CXXFLAGS=" ${BUILD_CXXFLAGS}" - export CPPUTEST_ADDITIONAL_LDFLAGS=" ${BUILD_LDFLAGS}" export UNITTEST_OUTPUT_XML=0 export USE_INITSYS_DUMMY=1 export BUILD_CONFIG="utest"