OpenJDK / jdk / jdk
changeset 59368:9bae474f4b16
8245281: Disabling hotspot gtest builds make it impossible to run tests
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Wed, 20 May 2020 14:09:18 +0200 |
| parents | 77135aff19b9 |
| children | b01b57c350bb |
| files | make/Main.gmk |
| diffstat | 1 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Main.gmk Wed May 20 13:23:46 2020 +0200 +++ b/make/Main.gmk Wed May 20 14:09:18 2020 +0200 @@ -1100,16 +1100,23 @@ # This target builds the documentation image docs-image: docs-jdk -# If not already set, set the JVM specific targets to build the test image -JVM_TEST_IMAGE_TARGETS ?= test-image-hotspot-jtreg-native test-image-hotspot-gtest +# This target builds the test image +test-image: prepare-test-image test-image-jdk-jtreg-native test-image-demos-jdk -ifeq ($(INCLUDE_GRAAL), true) - JVM_TEST_IMAGE_TARGETS += test-image-hotspot-jtreg-graal -endif +ifneq ($(JVM_TEST_IMAGE_TARGETS), ) + # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the + # standard hotspot set of tests. + test-image: $(JVM_TEST_IMAGE_TARGETS) +else + test-image: test-image-hotspot-jtreg-native + ifeq ($(BUILD_GTEST), true) + test-image: test-image-hotspot-gtest + endif -# This target builds the test image -test-image: prepare-test-image test-image-jdk-jtreg-native \ - test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) + ifeq ($(INCLUDE_GRAAL), true) + test-image: test-image-hotspot-jtreg-graal + endif +endif ifeq ($(BUILD_FAILURE_HANDLER), true) test-image: test-image-failure-handler