diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-18 11:38:13 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-07-18 11:48:06 -0700 |
| commit | 701aa645a3e61fe8866000bb66b1287196a5536a (patch) | |
| tree | 84b6ad8ab669b3e701d700cdf42229f2b44bcaaf /test/Android.run-test.mk | |
| parent | 5242c0ab0505f0f038b15c3d934a79a6b4e5ef17 (diff) | |
| download | art-701aa645a3e61fe8866000bb66b1287196a5536a.zip art-701aa645a3e61fe8866000bb66b1287196a5536a.tar.gz art-701aa645a3e61fe8866000bb66b1287196a5536a.tar.bz2 | |
Add GC verification test rules.
Change-Id: I7469ecaf98f680e7e642035f3536b00bdd97b486
Diffstat (limited to 'test/Android.run-test.mk')
| -rw-r--r-- | test/Android.run-test.mk | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 80ffcbb..6fcb11b 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -163,7 +163,7 @@ endif # $(2): host or target # $(3): default, optimizing or interpreter # $(4): 32 or 64 -# $(5): run tests with tracing enabled or not: trace or undefined +# $(5): run tests with tracing or GC verification enabled or not: trace, gcverify or undefined define define-test-art-run-test run_test_options := $(addprefix --runtime-option ,$(DALVIKVM_FLAGS)) run_test_rule_name := test-art-$(2)-run-test-$(3)-$(1)$(4) @@ -215,8 +215,17 @@ define define-test-art-run-test skip_test := true endif else - ifneq (,$(5)) - $$(error found $(5) expected undefined or -trace) + ifeq ($(5),gcverify) + run_test_options += --runtime-option -Xgc:preverify --runtime-option -Xgc:postverify \ + --runtime-option -Xgc:preverify_rosalloc --runtime-option -Xgc:postverify_rosalloc + run_test_rule_name := test-art-$(2)-run-test-gcverify-$(3)-$(1)$(4) + ifneq ($$(ART_TEST_GC_VERIFY),true) + skip_test := true + endif + else + ifneq (,$(5)) + $$(error found $(5) expected undefined or -trace) + endif endif endif ifeq ($$(skip_test),false) @@ -289,6 +298,9 @@ define define-test-art-run-test-group $$(eval $$(call define-test-art-run-test,$(1),$(2),default,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) $$(eval $$(call define-test-art-run-test,$(1),$(2),interpreter,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) $$(eval $$(call define-test-art-run-test,$(1),$(2),optimizing,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),default,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),interpreter,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),optimizing,$$(ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) do_second := false ifeq ($(2),host) ifneq ($$(HOST_PREFER_32_BIT),true) @@ -306,6 +318,9 @@ define define-test-art-run-test-group $$(eval $$(call define-test-art-run-test,$(1),$(2),default,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) $$(eval $$(call define-test-art-run-test,$(1),$(2),interpreter,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) $$(eval $$(call define-test-art-run-test,$(1),$(2),optimizing,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),trace)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),default,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),interpreter,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) + $$(eval $$(call define-test-art-run-test,$(1),$(2),optimizing,$$(2ND_ART_PHONY_TEST_$$(group_uc_host_or_target)_SUFFIX),gcverify)) endif $$(eval $$(call define-test-art-run-test-group-rule,test-art-$(2)-run-test-default-$(1), \ |