diff options
| author | 2016-10-03 16:40:13 -0700 | |
|---|---|---|
| committer | 2016-10-03 17:55:48 -0700 | |
| commit | b1c17bb080ccf41b30909c0401df59e6f3a1ebb1 (patch) | |
| tree | ff647a196aeb299fe70e5dbafa6a505f076d46ce /build/Android.common_test.mk | |
| parent | 6ba406580e73c69434d4d73ef5e5ccf47168854f (diff) | |
Compute PPID at ninja time
Using $(shell $$PPID) to compute PPID will return the pid of kati, which
will be the same for multiple sequential runs of make without changing
any makefiles. Replace it with a bash subshell command to return the pid
of ninja, which will be different for every call to make.
ART_HOST_TEST_DIR now contains $ that need to propagate to the final
bash command, and must be evaluated exactly once. Escape the $ in
${ART_HOST_TEST_DIR} in define-test-art-run-test so that
${ART_HOST_TEST_DIR} is not substituted in the function call to prevent
evaluating its contents in the $(eval) that wraps it, which would
substitute out the necessary $.
Test: m -j test-art-host
Change-Id: I3303805481cc1c77d1a321674e8c7c003043a7c4
Diffstat (limited to 'build/Android.common_test.mk')
| -rw-r--r-- | build/Android.common_test.mk | 4 |
1 files changed, 2 insertions, 2 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 |