diff options
| author | 2016-10-04 16:45:44 +0000 | |
|---|---|---|
| committer | 2016-10-04 16:45:45 +0000 | |
| commit | 82d4838d6bb3480cd25327cedc5179fb2d86881c (patch) | |
| tree | 2393b0ac0b1eee455c63e472fa0cdc4d74ab215f | |
| parent | eebe142e935e9444c7c947d02246e7fbe88b2cc4 (diff) | |
| parent | b1c17bb080ccf41b30909c0401df59e6f3a1ebb1 (diff) | |
Merge "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 449502c771..06485ca904 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-$(shell echo $$PPID) +ART_HOST_TEST_DIR := $(TMPDIR)/test-art-$$(echo $$PPID) else -ART_HOST_TEST_DIR := /tmp/$(USER)/test-art-$(shell echo $$PPID) +ART_HOST_TEST_DIR := /tmp/$(USER)/test-art-$$(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 211a69fa76..33108ddc43 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -1040,7 +1040,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) |