equal
deleted
inserted
replaced
226 |
226 |
227 ################################################################################ |
227 ################################################################################ |
228 # Build hotspot target |
228 # Build hotspot target |
229 |
229 |
230 ifeq ($(BUILD_HOTSPOT),true) |
230 ifeq ($(BUILD_HOTSPOT),true) |
231 hotspot: |
231 hotspot: |
232 ifeq ($(USE_NEW_HOTSPOT_BUILD), true) |
232 +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk) |
233 +($(CD) $(HOTSPOT_TOPDIR)/makefiles && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk) |
|
234 else |
|
235 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk) |
|
236 endif |
|
237 endif |
233 endif |
238 |
234 |
239 hotspot-ide-project: |
235 hotspot-ide-project: |
240 +($(CD) $(HOTSPOT_TOPDIR)/makefiles && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk) |
236 +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk) |
241 |
237 |
242 ALL_TARGETS += hotspot hotspot-ide-project |
238 ALL_TARGETS += hotspot hotspot-ide-project |
243 |
239 |
244 ################################################################################ |
240 ################################################################################ |
245 # Build demos and samples targets |
241 # Build demos and samples targets |
400 |
396 |
401 test-image-jdk-jtreg-native: |
397 test-image-jdk-jtreg-native: |
402 +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \ |
398 +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \ |
403 test-image-jdk-jtreg-native) |
399 test-image-jdk-jtreg-native) |
404 |
400 |
|
401 ifeq ($(BUILD_GTEST), true) |
|
402 test-image-hotspot-gtest: |
|
403 +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk) |
|
404 endif |
|
405 |
405 build-test-lib: |
406 build-test-lib: |
406 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk) |
407 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk) |
407 |
408 |
408 ifeq ($(BUILD_FAILURE_HANDLER), true) |
409 ifeq ($(BUILD_FAILURE_HANDLER), true) |
409 # Builds the failure handler jtreg extension |
410 # Builds the failure handler jtreg extension |
423 endif |
424 endif |
424 |
425 |
425 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
426 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
426 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
427 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
427 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
428 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
428 test-failure-handler test-image-failure-handler |
429 test-failure-handler test-image-failure-handler test-image-hotspot-gtest |
429 |
430 |
430 ################################################################################ |
431 ################################################################################ |
431 # Run tests |
432 # Run tests |
432 |
433 |
433 # Run tests specified by $(TEST), or the default test set. |
434 # Run tests specified by $(TEST), or the default test set. |
667 |
668 |
668 test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native |
669 test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native |
669 |
670 |
670 test-image-jdk-jtreg-native: build-test-jdk-jtreg-native |
671 test-image-jdk-jtreg-native: build-test-jdk-jtreg-native |
671 |
672 |
|
673 test-image-hotspot-gtest: hotspot |
|
674 |
672 test-hotspot-internal: exploded-image |
675 test-hotspot-internal: exploded-image |
673 |
676 |
674 test-hotspot-jtreg: jimages test-image |
677 test-hotspot-jtreg: jimages test-image |
675 |
678 |
676 install: product-images |
679 install: product-images |
751 # This target builds the documentation image |
754 # This target builds the documentation image |
752 docs-image: docs-javadoc docs-jvmtidoc |
755 docs-image: docs-javadoc docs-jvmtidoc |
753 |
756 |
754 # This target builds the test image |
757 # This target builds the test image |
755 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
758 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
756 test-image-jdk-jtreg-native test-image-failure-handler |
759 test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest |
757 |
760 |
758 # all-images is the top-most target, it builds all our deliverables ("images"). |
761 # all-images is the top-most target, it builds all our deliverables ("images"). |
759 all-images: product-images test-image docs-image |
762 all-images: product-images test-image docs-image |
760 |
763 |
761 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \ |
764 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \ |