< prev index next >
make/Main.gmk
Print this page
*** 1,7 ****
#
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
--- 1,7 ----
#
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
*** 236,251 ****
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
mac-bundles:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
- prepare-test-image:
- $(MKDIR) -p $(TEST_IMAGE_DIR)
- $(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
-
ALL_TARGETS += source-tips bootcycle-images zip-security zip-source strip-binaries \
! jrtfs-jar jimages profiles mac-bundles prepare-test-image
################################################################################
# Docs targets
docs-javadoc:
--- 236,247 ----
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
mac-bundles:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
ALL_TARGETS += source-tips bootcycle-images zip-security zip-source strip-binaries \
! jrtfs-jar jimages profiles mac-bundles
################################################################################
# Docs targets
docs-javadoc:
*** 255,275 ****
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
ALL_TARGETS += docs-javadoc docs-jvmtidoc
################################################################################
! # Test target
test:
! ($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
! JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \
! ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
test-make:
($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
! ALL_TARGETS += test test-make
################################################################################
# Verification targets
verify-modules:
--- 251,297 ----
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
ALL_TARGETS += docs-javadoc docs-jvmtidoc
################################################################################
! # Build tests
! #
!
! prepare-test-image:
! $(MKDIR) -p $(TEST_IMAGE_DIR)
! $(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
!
! build-test-hotspot-jtreg-native:
! +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk build-test-hotspot-jtreg-native)
!
! test-image-hotspot-jtreg-native:
! +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk test-image-hotspot-jtreg-native)
!
! build-test-jdk-jtreg-native:
! +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk build-test-jdk-jtreg-native)
!
! test-image-jdk-jtreg-native:
! +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk test-image-jdk-jtreg-native)
!
! ################################################################################
! # Run tests
+ # Run tests specified by $(TEST), or the default test set.
test:
! $(call RunTests, $(TEST))
!
! test-hotspot-jtreg-native:
! $(call RunTests, "hotspot_native_sanity")
!
! test-jdk-jtreg-native:
! $(call RunTests, "jdk_native_sanity")
test-make:
($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
! ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native build-test-jdk-jtreg-native \
! test-image-hotspot-jtreg-native test-image-jdk-jtreg-native test test-make
################################################################################
# Verification targets
verify-modules:
*** 396,411 ****
docs-javadoc: gensrc rmic
docs-jvmtidoc: hotspot
! test: jimages
verify-modules: exploded-image
test-make: clean-test-make
endif
################################################################################
# Virtual targets without recipes
--- 418,437 ----
docs-javadoc: gensrc rmic
docs-jvmtidoc: hotspot
! test: jimages test-image
verify-modules: exploded-image
test-make: clean-test-make
+ test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
+
+ test-image-jdk-jtreg-native: build-test-jdk-jtreg-native
+
endif
################################################################################
# Virtual targets without recipes
*** 459,469 ****
# This target builds the documentation image
docs-image: docs-javadoc docs-jvmtidoc
# This target builds the test image
! test-image: prepare-test-image
# all-images is the top-most target, it builds all our deliverables ("images").
all-images: product-images test-image docs-image
ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \
--- 485,495 ----
# This target builds the documentation image
docs-image: docs-javadoc docs-jvmtidoc
# This target builds the test image
! test-image: prepare-test-image test-image-hotspot-jtreg-native test-image-jdk-jtreg-native
# all-images is the top-most target, it builds all our deliverables ("images").
all-images: product-images test-image docs-image
ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \
*** 493,502 ****
--- 519,530 ----
# file.
CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \
images make-support test-make
CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
+ CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native
+ CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
CLEAN_PHASES := gensrc java native include
CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
# Construct targets of the form clean-$module-$phase
CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
*** 508,517 ****
--- 536,548 ----
$(ECHO) Cleaned all build artifacts.
$(CLEAN_DIR_TARGETS):
$(call CleanDir,$(patsubst clean-%, %, $@))
+ $(CLEAN_TEST_TARGETS):
+ $(call CleanTest,$(patsubst clean-test-%, %, $@))
+
$(CLEAN_PHASE_TARGETS):
$(call Clean-$(patsubst clean-%,%, $@))
$(CLEAN_MODULE_TARGETS):
$(call CleanModule,$(patsubst clean-%, %, $@))
*** 540,551 ****
&& $(RM) -r $(OUTPUT_ROOT)) \
fi \
)
$(ECHO) Cleaned everything, you will have to re-run configure.
! ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_PHASE_TARGETS) \
! $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
################################################################################
# Setup a rule for SPEC file that fails if executed. This check makes sure the
# configuration is up to date after changes to configure.
--- 571,582 ----
&& $(RM) -r $(OUTPUT_ROOT)) \
fi \
)
$(ECHO) Cleaned everything, you will have to re-run configure.
! ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_TEST_TARGETS) \
! $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
################################################################################
# Setup a rule for SPEC file that fails if executed. This check makes sure the
# configuration is up to date after changes to configure.
< prev index next >