diff options
| author | 2014-04-01 18:09:33 -0700 | |
|---|---|---|
| committer | 2014-04-01 18:10:24 -0700 | |
| commit | 934ce8082aeccb491a24f5af0fdcf40966d54dfb (patch) | |
| tree | bf31ba5c548c3ba93db494060a50908dcfaef990 | |
| parent | b74a8625b6194fe86769416c70497e74a73a740d (diff) | |
Use TEST_ART_RUN_TESTS consistently
Change-Id: I0242702886d53a39f2604e209a0763ff82278e1c
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | test/Android.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index fe39c030c6..ac19a567f5 100644 --- a/Android.mk +++ b/Android.mk @@ -191,7 +191,7 @@ test-art-host-run-test-$(1): test-art-host-run-test-default-$(1) test-art-host-r endef -$(foreach test, $(wildcard art/test/[0-9]*), $(eval $(call declare-test-art-host-run-test,$(notdir $(test))))) +$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-test-art-host-run-test,$(test)))) .PHONY: test-art-host-run-test-default test-art-host-run-test-default: $(TEST_ART_HOST_RUN_TEST_DEFAULT_TARGETS) @@ -254,7 +254,7 @@ test-art-run-test-$(1): test-art-host-run-test-$(1) test-art-target-run-test-$(1 endef -$(foreach test, $(wildcard art/test/[0-9]*), $(eval $(call declare-test-art-target-run-test,$(notdir $(test))))) +$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-test-art-target-run-test,$(test)))) .PHONY: test-art-target-run-test test-art-target-run-test: $(TEST_ART_TARGET_RUN_TEST_TARGETS) diff --git a/test/Android.mk b/test/Android.mk index d15eacf64e..0c27349111 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -190,7 +190,9 @@ TEST_ART_RUN_TESTS := $(wildcard $(LOCAL_PATH)/[0-9]*) TEST_ART_RUN_TESTS := $(subst $(LOCAL_PATH)/,, $(TEST_ART_RUN_TESTS)) TEST_ART_TIMING_SENSITIVE_RUN_TESTS := 055-enum-performance ifdef dist_goal # disable timing sensitive tests on "dist" builds. - $(foreach test, $(TEST_ART_TIMING_SENSITIVE_RUN_TESTS), $(eval TEST_ART_RUN_TESTS := $(filter-out $(test), $(TEST_ART_RUN_TESTS)))) + $(foreach test, $(TEST_ART_TIMING_SENSITIVE_RUN_TESTS), \ + $(info Skipping $(test)) \ + $(eval TEST_ART_RUN_TESTS := $(filter-out $(test), $(TEST_ART_RUN_TESTS)))) endif $(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-make-art-run-test,$(test)))) |