diff options
| author | 2016-10-05 01:38:09 +0000 | |
|---|---|---|
| committer | 2016-10-05 01:38:09 +0000 | |
| commit | 3601e4a5c52fcf6197fe57498a28d66f3fac076c (patch) | |
| tree | c2eb87153d8af5342bac453fe1dbedb150d8485d | |
| parent | c13fbeb2201dc0bf783670d4548a49f03b1cb33e (diff) | |
| parent | a82a1aca396cb9dca1f13aa284dbec5d428b82a1 (diff) | |
Merge "Revert "Compute PPID at ninja time""
| -rw-r--r-- | build/Android.common_test.mk | 4 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 06485ca904..449502c771 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -21,9 +21,9 @@ include art/build/Android.common_path.mk # Directory used for temporary test files on the host. ifneq ($(TMPDIR),) -ART_HOST_TEST_DIR := $(TMPDIR)/test-art-$$(echo $$PPID) +ART_HOST_TEST_DIR := $(TMPDIR)/test-art-$(shell echo $$PPID) else -ART_HOST_TEST_DIR := /tmp/$(USER)/test-art-$$(echo $$PPID) +ART_HOST_TEST_DIR := /tmp/$(USER)/test-art-$(shell echo $$PPID) endif # List of known broken tests that we won't attempt to execute. The test name must be the full diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 64643218ea..d5a93b2639 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -1038,7 +1038,7 @@ define define-test-art-run-test endif endif run_test_rule_name := test-art-$(1)-run-test-$(2)-$(3)-$(4)-$(5)-$(6)-$(7)-$(8)-$(9)-$(10)-$(11)-$(12)$(13) - run_test_options := --output-path $$(ART_HOST_TEST_DIR)/run-test-output/$$(run_test_rule_name) \ + run_test_options := --output-path $(ART_HOST_TEST_DIR)/run-test-output/$$(run_test_rule_name) \ $$(run_test_options) ifneq ($(ART_TEST_ANDROID_ROOT),) run_test_options := --android-root $(ART_TEST_ANDROID_ROOT) $$(run_test_options) |