commit e4d159a225795ad3dd35f99b0f4ef73eb01a9056
author Brian Carlstrom <bdc@google.com> Mon Mar 31 14:00:52 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue Apr 01 00:43:30 2014 -0700
tree 1af0c4b6de0dfe593e5004d060bdd8356870f700
parent 81ed34e686532cebc1e17a273110decf0dd24e81

Disable timing sensitive tests on dist builds.

Change-Id: I94ebeb5009fac7026bd157a12bdf39e392665a3a

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index da5b35f..bb6c437 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -168,7 +168,13 @@
 endef
 
 # Expand all tests.
-$(foreach test, $(wildcard $(LOCAL_PATH)/[0-9]*), $(eval $(call declare-make-art-run-test,$(notdir $(test)))))
+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))))
+endif
+$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-make-art-run-test,$(test))))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests