Revert "Remove test_per_src from ART tests."
This reverts commit 8103e479d8f8447584582b2b70752029f7087776.
Reason for revert: asan run fails in multiple ways
Test: ran ./art/test/testrunner/run_build_test_target.py art-gtest-asan
Change-Id: Ib9f2887436a664b64c6410f56a25ae2dd0e0aab4
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 1002cab..ab9d594 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -501,7 +501,6 @@
gtest_exe := $(2)
# Dependencies for all host gtests.
gtest_deps := $$(ART_HOST_DEX_DEPENDENCIES) \
- $$(ART_TEST_HOST_GTEST_DEPENDENCIES) \
$$(HOST_BOOT_IMAGE_JARS) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libicu_jni$$(ART_HOST_SHLIB_EXTENSION) \
$$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
@@ -533,20 +532,20 @@
gtest_deps += $$($(3)HOST_BOOT_IMAGE)
endif
+ ART_TEST_HOST_GTEST_DEPENDENCIES += $$(gtest_deps)
+
.PHONY: $$(gtest_rule)
$$(gtest_rule): $$(gtest_output)
# Re-run the tests, even if nothing changed. Until the build system has a dedicated "no cache"
# option, claim to write a file that is never produced.
$$(gtest_output): .KATI_IMPLICIT_OUTPUTS := $$(gtest_output)-nocache
-# Limit concurrent runs. Each test itself is already highly parallel (and thus memory hungry).
-$$(gtest_output): .KATI_NINJA_POOL := highmem_pool
$$(gtest_output): NAME := $$(gtest_rule)
ifeq (,$(SANITIZE_HOST))
$$(gtest_output): $$(gtest_exe) $$(gtest_deps)
$(hide) ($$(call ART_TEST_SKIP,$$(NAME)) && \
timeout --foreground -k 120s 2400s $(HOST_OUT_EXECUTABLES)/signal_dumper -s 15 \
- $$< --gtest_output=xml:$$@ --deadline_threshold_ms=600000 && \
+ $$< --gtest_output=xml:$$@ && \
$$(call ART_TEST_PASSED,$$(NAME))) || $$(call ART_TEST_FAILED,$$(NAME))
else
# Note: envsetup currently exports ASAN_OPTIONS=detect_leaks=0 to suppress leak detection, as some
@@ -580,40 +579,6 @@
gtest_suffix :=
endef # define-art-gtest-rule-host
-# Global list of all dependencies. All tests depend on all tools.
-# Removal of test_per_src broke the naming convention for dependencies,
-# so the fine-grained dependencies no longer work for now.
-# TODO: Move all dependency tracking to the blueprint file.
-ART_GTEST_ALL_DEX_DEPS := \
- EmptyUncompressed \
- EmptyUncompressedAligned \
- LinkageTest \
- MainStripped \
- MainUncompressedAligned \
- MultiDexUncompressedAligned \
- VerifierDeps \
- VerifierDepsMulti \
- VerifySoftFailDuringClinit \
- $(foreach dir,$(GTEST_DEX_DIRECTORIES),$(dir))
-ART_TEST_HOST_GTEST_DEPENDENCIES += \
- $(HOST_OUT_EXECUTABLES)/dex2oatd \
- $(HOST_OUT_EXECUTABLES)/dex2oatds \
- $(HOST_OUT_EXECUTABLES)/dexanalyze \
- $(HOST_OUT_EXECUTABLES)/dexdiag \
- $(HOST_OUT_EXECUTABLES)/dexdump \
- $(HOST_OUT_EXECUTABLES)/dexlayoutd \
- $(HOST_OUT_EXECUTABLES)/dexlist \
- $(HOST_OUT_EXECUTABLES)/dexoptanalyzerd \
- $(HOST_OUT_EXECUTABLES)/hiddenapid \
- $(HOST_OUT_EXECUTABLES)/imgdiagd \
- $(HOST_OUT_EXECUTABLES)/oatdumpd \
- $(HOST_OUT_EXECUTABLES)/oatdumpds \
- $(HOST_OUT_EXECUTABLES)/profmand \
- $(foreach file,$(ART_GTEST_ALL_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX))
-ART_TEST_TARGET_GTEST_DEPENDENCIES += \
- $(TESTING_ART_APEX) \
- $(foreach file,$(ART_GTEST_ALL_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX))
-
# Add the additional dependencies for the specified test
# $(1): test name
define add-art-gtest-dependencies