summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2018-01-10 17:18:37 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-01-10 17:18:37 +0000
commit9d402eb63cc243fa89f1b5d954f95cd149cf1437 (patch)
tree28cf8215018e09ef4f4493570911cc119cb85fa8
parentf4bf58d9b13972117c640ea1d7bfa6e6dfc189ea (diff)
parent31f22d62e260d1aab17a3f148f3bd8b52b0ff135 (diff)
Merge "Change from PPID to CWD to distinguish between different trees"
-rw-r--r--build/Android.common_test.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index 3d1f4343f1..7fae7f6200 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -23,10 +23,10 @@ include art/build/Android.common_path.mk
ifneq ($(TMPDIR),)
ART_HOST_TEST_DIR := $(TMPDIR)/test-art-$(shell echo $$PPID)
else
-# Use a BSD checksum calculated from PPID and USER as one of the path
+# Use a BSD checksum calculated from CWD and USER as one of the path
# components for the test output. This should allow us to run tests from
# multiple repositories at the same time.
-ART_HOST_TEST_DIR := /tmp/test-art-$(shell echo $$PPID-${USER} | sum | cut -d ' ' -f1)
+ART_HOST_TEST_DIR := /tmp/test-art-$(shell echo $$CWD-${USER} | sum | cut -d ' ' -f1)
endif
# List of known broken tests that we won't attempt to execute. The test name must be the full