Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e85ca9d authored by Dan Shi's avatar Dan Shi
Browse files

Allow non-compat suite to locate testcases dir properly 

cc_test that can run on hostside are default to be part of
host-unit-tests suite. The suite is set up similar to device-tests and
general-tests, and it's not a compatibility suite. So following variable
will always be empty:
$(COMPATIBILITY_TESTCASES_OUT_host-unit-tests.
It should use HOST_OUT_TESTCASES as testcases dir.

The same logic should be applied to art-host-tests.

Bug: None
Test: build
Change-Id: Ieddacd5157da73c6df473c103be109d9c3a55281
parent 76413f4c

core/main.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -931,7 +931,7 @@ $(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tes 
    $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\

    $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\

    $(foreach dep,$(my_deps),\

    $(foreach dep,$(my_deps),\

      $(foreach f,$(ALL_MODULES.$(dep).HOST_SHARED_LIBRARY_FILES),\

      $(foreach f,$(ALL_MODULES.$(dep).HOST_SHARED_LIBRARY_FILES),\

        $(if $(filter $(suite),device-tests general-tests),\

        $(if $(filter $(suite),device-tests general-tests art-host-tests host-unit-tests),\

          $(eval my_testcases := $(HOST_OUT_TESTCASES)),\

          $(eval my_testcases := $(HOST_OUT_TESTCASES)),\

          $(eval my_testcases := $$(COMPATIBILITY_TESTCASES_OUT_$(suite))))\

          $(eval my_testcases := $$(COMPATIBILITY_TESTCASES_OUT_$(suite))))\

        $(eval target := $(my_testcases)/$(lastword $(subst /, ,$(dir $(f))))/$(notdir $(f)))\

        $(eval target := $(my_testcases)/$(lastword $(subst /, ,$(dir $(f))))/$(notdir $(f)))\