From 09dbe042bf3c119106bb5de3df6e8d7113951bc7 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Tue, 10 Mar 2015 14:36:56 +0100 Subject: [PATCH] 8073021: add native code coverage target into makefiles Reviewed-by: ihse, tbell, iignatyev --- common/autoconf/configure.ac | 1 + common/autoconf/flags.m4 | 25 +++++++- common/autoconf/generated-configure.sh | 85 +++++++++++++++++++++++++- common/autoconf/jdk-options.m4 | 38 ++++++++++++ common/autoconf/spec.gmk.in | 16 +++++ make/Images.gmk | 39 +++++++++++- make/Jprt.gmk | 38 ++++++++++-- make/Main.gmk | 2 +- make/common/TestFilesCompilation.gmk | 8 +-- 9 files changed, 237 insertions(+), 15 deletions(-) diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index 902ba475684..6cdab79347e 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -195,6 +195,7 @@ FLAGS_SETUP_COMPILER_FLAGS_MISC # Setup debug symbols (need objcopy from the toolchain for that) JDKOPT_SETUP_DEBUG_SYMBOLS +JDKOPT_SETUP_CODE_COVERAGE ############################################################################### # diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 28666d4320a..045a7922b2f 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -677,7 +677,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], # The shared libraries are compiled using the picflag. CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" - CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " + CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA" # Executable flags CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK" @@ -688,6 +688,19 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], AC_SUBST(CXXFLAGS_JDKLIB) AC_SUBST(CXXFLAGS_JDKEXE) + # Flags for compiling test libraries + CFLAGS_TESTLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" + CXXFLAGS_TESTLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA" + + # Flags for compiling test executables + CFLAGS_TESTEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK" + CXXFLAGS_TESTEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK" + + AC_SUBST(CFLAGS_TESTLIB) + AC_SUBST(CFLAGS_TESTEXE) + AC_SUBST(CXXFLAGS_TESTLIB) + AC_SUBST(CXXFLAGS_TESTEXE) + # Setup LDFLAGS et al. # @@ -801,6 +814,16 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], AC_SUBST(LDFLAGS_JDKLIB_SUFFIX) AC_SUBST(LDFLAGS_JDKEXE_SUFFIX) AC_SUBST(LDFLAGS_CXX_JDK) + + LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" + LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" + LDFLAGS_TESTLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX" + LDFLAGS_TESTEXE_SUFFIX="$LDFLAGS_JDKEXE_SUFFIX" + + AC_SUBST(LDFLAGS_TESTLIB) + AC_SUBST(LDFLAGS_TESTEXE) + AC_SUBST(LDFLAGS_TESTLIB_SUFFIX) + AC_SUBST(LDFLAGS_TESTEXE_SUFFIX) ]) # FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE], diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 578bbf978e6..e041c3ee64a 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -680,17 +680,26 @@ X_PRE_LIBS X_CFLAGS XMKMF FIXPATH +GCOV_ENABLED ZIP_DEBUGINFO_FILES ENABLE_DEBUG_SYMBOLS CFLAGS_WARNINGS_ARE_ERRORS DISABLE_WARNING_PREFIX COMPILER_SUPPORTS_TARGET_BITS_FLAG ZERO_ARCHFLAG +LDFLAGS_TESTEXE_SUFFIX +LDFLAGS_TESTLIB_SUFFIX +LDFLAGS_TESTEXE +LDFLAGS_TESTLIB LDFLAGS_CXX_JDK LDFLAGS_JDKEXE_SUFFIX LDFLAGS_JDKLIB_SUFFIX LDFLAGS_JDKEXE LDFLAGS_JDKLIB +CXXFLAGS_TESTEXE +CXXFLAGS_TESTLIB +CFLAGS_TESTEXE +CFLAGS_TESTLIB CXXFLAGS_JDKEXE CXXFLAGS_JDKLIB CFLAGS_JDKEXE @@ -1085,6 +1094,7 @@ with_extra_cxxflags with_extra_ldflags enable_debug_symbols enable_zip_debug_info +enable_native_coverage with_x with_cups with_cups_include @@ -1853,6 +1863,9 @@ Optional Features: --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] + --enable-native-coverage + enable native compilation with code coverage + data[disabled] --disable-freetype-bundling disable bundling of the freetype library with the build result [enabled on Windows or when using @@ -3994,6 +4007,12 @@ pkgadd_help() { +################################################################################ +# +# Gcov coverage data for hotspot +# + + # # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -4349,7 +4368,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1425893864 +DATE_WHEN_GENERATED=1425994551 ############################################################################### # @@ -42564,7 +42583,7 @@ fi # The shared libraries are compiled using the picflag. CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" - CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " + CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA" # Executable flags CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK" @@ -42575,6 +42594,19 @@ fi + # Flags for compiling test libraries + CFLAGS_TESTLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" + CXXFLAGS_TESTLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA" + + # Flags for compiling test executables + CFLAGS_TESTEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK" + CXXFLAGS_TESTEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK" + + + + + + # Setup LDFLAGS et al. # @@ -42689,6 +42721,16 @@ fi + LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" + LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" + LDFLAGS_TESTLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX" + LDFLAGS_TESTEXE_SUFFIX="$LDFLAGS_JDKEXE_SUFFIX" + + + + + + # Some Zero and Shark settings. # ZERO_ARCHFLAG tells the compiler which mode to build for @@ -42993,6 +43035,45 @@ $as_echo "${enable_zip_debug_info}" >&6; } + # Check whether --enable-native-coverage was given. +if test "${enable_native_coverage+set}" = set; then : + enableval=$enable_native_coverage; +fi + + GCOV_ENABLED="false" + if test "x$enable_native_coverage" = "xyes"; then + if test "x$TOOLCHAIN_TYPE" = "xgcc"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if native coverage is enabled" >&5 +$as_echo_n "checking if native coverage is enabled... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline" + GCOV_LDFLAGS="-fprofile-arcs" + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS" + CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS" + CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS" + CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS" + CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $GCOV_CFLAGS" + LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $GCOV_LDFLAGS" + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $GCOV_LDFLAGS" + GCOV_ENABLED="true" + else + as_fn_error $? "--enable-native-coverage only works with toolchain type gcc" "$LINENO" 5 + fi + elif test "x$enable_native_coverage" = "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if native coverage is enabled" >&5 +$as_echo_n "checking if native coverage is enabled... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + elif test "x$enable_native_coverage" != "x"; then + as_fn_error $? "--enable-native-coverage can only be assigned \"yes\" or \"no\"" "$LINENO" 5 + fi + + + + ############################################################################### # # Check dependencies for external and internal libraries. diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 1e0b1ecefa0..50471b2fce4 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -640,3 +640,41 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS], AC_SUBST(ENABLE_DEBUG_SYMBOLS) AC_SUBST(ZIP_DEBUGINFO_FILES) ]) + +################################################################################ +# +# Gcov coverage data for hotspot +# +AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE], +[ + AC_ARG_ENABLE(native-coverage, [AS_HELP_STRING([--enable-native-coverage], + [enable native compilation with code coverage data@<:@disabled@:>@])]) + GCOV_ENABLED="false" + if test "x$enable_native_coverage" = "xyes"; then + if test "x$TOOLCHAIN_TYPE" = "xgcc"; then + AC_MSG_CHECKING([if native coverage is enabled]) + AC_MSG_RESULT([yes]) + GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline" + GCOV_LDFLAGS="-fprofile-arcs" + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS" + CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS" + CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS" + CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS" + CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $GCOV_CFLAGS" + LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $GCOV_LDFLAGS" + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $GCOV_LDFLAGS" + GCOV_ENABLED="true" + else + AC_MSG_ERROR([--enable-native-coverage only works with toolchain type gcc]) + fi + elif test "x$enable_native_coverage" = "xno"; then + AC_MSG_CHECKING([if native coverage is enabled]) + AC_MSG_RESULT([no]) + elif test "x$enable_native_coverage" != "x"; then + AC_MSG_ERROR([--enable-native-coverage can only be assigned "yes" or "no"]) + fi + + AC_SUBST(GCOV_ENABLED) +]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 4ea1e35191c..d21ab83451a 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -292,6 +292,8 @@ UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ # Enable RMIConnector IIOP transport RMICONNECTOR_IIOP=@RMICONNECTOR_IIOP@ +GCOV_ENABLED=@GCOV_ENABLED@ + # Necessary additional compiler flags to compile X11 X_CFLAGS:=@X_CFLAGS@ X_LIBS:=@X_LIBS@ @@ -380,6 +382,16 @@ LIBCXX:=@LIBCXX@ # Sometimes a different linker is needed for c++ executables LDEXECXX:=@FIXPATH@ @LDEXECXX@ +# Compiler and linker flags used when building native tests +CFLAGS_TESTLIB:=@CFLAGS_TESTLIB@ +CXXFLAGS_TESTLIB:=@CXXFLAGS_TESTLIB@ +CFLAGS_TESTEXE:=@CFLAGS_TESTEXE@ +CXXFLAGS_TESTEXE:=@CXXFLAGS_TESTEXE@ +LDFLAGS_TESTLIB:=@LDFLAGS_TESTLIB@ +LDFLAGS_TESTLIB_SUFFIX:=@LDFLAGS_TESTLIB_SUFFIX@ +LDFLAGS_TESTEXE:=@LDFLAGS_TESTEXE@ +LDFLAGS_TESTEXE_SUFFIX:=@LDFLAGS_TESTEXE_SUFFIX@ + # BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the # build platform. BUILD_CC:=@FIXPATH@ @BUILD_CC@ @@ -702,6 +714,10 @@ JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) TEST_IMAGE_SUBDIR:=test TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) +# Symbols image +SYMBOLS_IMAGE_SUBDIR:=symbols +SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR) + # Macosx bundles directory definitions JDK_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents JRE_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents diff --git a/make/Images.gmk b/make/Images.gmk index 9ee57d3fb29..6fe4f766d36 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -487,6 +487,42 @@ $(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \ JDK_TARGETS += $(COPY_JRTFS_JAR) +################################################################################ +# Code coverage data files + +ifeq ($(GCOV_ENABLED), true) + + GCOV_FIND_EXPR := -type f -name "*.gcno" + + ifeq ($(JVM_VARIANT_CLIENT), true) + $(eval $(call SetupCopyFiles,COPY_HOTSPOT_CLIENT_GCOV_GCNO, \ + SRC := $(HOTSPOT_OUTPUTDIR), \ + DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/client, \ + FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler1/ $(GCOV_FIND_EXPR)), \ + FLATTEN := true)) + + SYMBOLS_TARGETS += $(COPY_HOTSPOT_CLIENT_GCOV_GCNO) + endif + + ifeq ($(JVM_VARIANT_SERVER), true) + $(eval $(call SetupCopyFiles,COPY_HOTSPOT_SERVER_GCOV_GCNO, \ + SRC := $(HOTSPOT_OUTPUTDIR), \ + DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/server, \ + FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler2/ $(GCOV_FIND_EXPR)), \ + FLATTEN := true)) + + SYMBOLS_TARGETS += $(COPY_HOTSPOT_SERVER_GCOV_GCNO) + endif + + $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \ + SRC := $(SUPPORT_OUTPUTDIR)/native, \ + DEST := $(SYMBOLS_IMAGE_DIR)/gcov/jdk, \ + FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR)))) + + SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO) + +endif + ################################################################################ # Include custom post hook here to make it possible to augment the target lists @@ -498,7 +534,8 @@ $(eval $(call IncludeCustomExtension, , Images-post.gmk)) $(JRE_TARGETS): $(TOOL_JRE_TARGETS) $(JDK_TARGETS): $(TOOL_JDK_TARGETS) -jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) +jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \ + $(SYMBOLS_TARGETS) $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) diff --git a/make/Jprt.gmk b/make/Jprt.gmk index 516e5ff615d..f3f8726c23f 100644 --- a/make/Jprt.gmk +++ b/make/Jprt.gmk @@ -33,10 +33,16 @@ ifneq ($(CYGPATH), ) override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE)) endif ifdef JPRT_ARCHIVE_INSTALL_BUNDLE - override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) + override JPRT_ARCHIVE_INSTALL_BUNDLE := \ + $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) endif ifdef JPRT_ARCHIVE_TEST_BUNDLE - override JPRT_ARCHIVE_TEST_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE)) + override JPRT_ARCHIVE_TEST_BUNDLE := \ + $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE)) + endif + ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE + override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \ + $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)) endif endif @@ -51,6 +57,9 @@ endif ifndef JPRT_ARCHIVE_TEST_BUNDLE JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip endif +ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE + JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip +endif ifeq ($(SKIP_BOOT_CYCLE), false) jprt_bundle: bootcycle-images @@ -59,6 +68,10 @@ endif # This target must be called in the context of a SPEC file jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE) +ifeq ($(GCOV_ENABLED), true) + jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE) +endif + # This target must be called in the context of a SPEC file $(JPRT_ARCHIVE_BUNDLE): bundles $(MKDIR) -p $(@D) @@ -70,6 +83,11 @@ $(JPRT_ARCHIVE_TEST_BUNDLE): bundles $(RM) $@ $(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@ +$(JPRT_ARCHIVE_SYMBOLS_BUNDLE): bundles + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip $@ + SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR) @@ -80,11 +98,19 @@ SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) bundles: all @$(call TargetEnter) $(MKDIR) -p $(BUILD_OUTPUT)/bundles - $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . - $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . - $(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip . + $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r \ + $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . + $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r \ + $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . + $(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r \ + $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip . if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ - $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r \ + $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ + fi + if [ -d $(SYMBOLS_IMAGE_DIR) ] ; then \ + $(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIP) -y -q -r \ + $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip . ; \ fi @$(call TargetExit) diff --git a/make/Main.gmk b/make/Main.gmk index f0643d2553b..5a4e0d5c23a 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -531,7 +531,7 @@ ALL_TARGETS += default jdk images docs all # file. CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ - images make-support test-make + images make-support test-make bundles CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk index 57d5f109716..8c144f8ae7c 100644 --- a/make/common/TestFilesCompilation.gmk +++ b/make/common/TestFilesCompilation.gmk @@ -68,13 +68,13 @@ define SetupTestFilesCompilationInner ifeq ($$($1_TYPE), LIBRARY) $1_PREFIX = lib $1_OUTPUT_SUBDIR := lib - $1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) - $1_LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN) + $1_CFLAGS := $(CFLAGS_TESTLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) + $1_LDFLAGS := $(LDFLAGS_TESTLIB) $(call SET_SHARED_LIBRARY_ORIGIN) else ifeq ($$($1_TYPE), PROGRAM) $1_PREFIX = exe $1_OUTPUT_SUBDIR := bin - $1_CFLAGS := $(CFLAGS_JDKEXE) $(CFLAGS_WARNINGS_ARE_ERRORS) - $1_LDFLAGS := $(LDFLAGS_JDKEXE) + $1_CFLAGS := $(CFLAGS_TESTEXE) $(CFLAGS_WARNINGS_ARE_ERRORS) + $1_LDFLAGS := $(LDFLAGS_TESTEXE) else $$(error Unknown type: $$($1_TYPE)) endif