Mercurial > hg > openjdk > icedtea > jdk7 > hotspot
changeset 3479:690f89a699b1
7164344: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Solaris and Windows
Summary: Disable FDS by default on Solaris; disable ZIP_DEBUGINFO_FILES by default on Windows.
Reviewed-by: acorn, sspitsyn
author | dcubed |
---|---|
date | Tue, 08 May 2012 11:40:03 -0700 |
parents | 0653bc115ff5 |
children | 28392714005e |
files | make/solaris/makefiles/defs.make make/windows/makefiles/defs.make |
diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/solaris/makefiles/defs.make Tue May 08 11:37:37 2012 -0700 +++ b/make/solaris/makefiles/defs.make Tue May 08 11:40:03 2012 -0700 @@ -97,12 +97,18 @@ # overridden in some situations, e.g., a BUILD_FLAVOR != product # build. + # Disable FULL_DEBUG_SYMBOLS by default because dtrace tests are + # failing in nightly when the debug info files are ZIP'ed. On + # Solaris debug info files need to be ZIP'ed to reduce the impact + # on disk space footprint. + FULL_DEBUG_SYMBOLS ?= 0 ifeq ($(BUILD_FLAVOR), product) - FULL_DEBUG_SYMBOLS ?= 1 + # FULL_DEBUG_SYMBOLS ?= 1 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) else # debug variants always get Full Debug Symbols (if available) - ENABLE_FULL_DEBUG_SYMBOLS = 1 + # ENABLE_FULL_DEBUG_SYMBOLS = 1 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) endif _JUNK_ := $(shell \ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") @@ -160,7 +166,9 @@ _JUNK_ := $(shell \ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") - ZIP_DEBUGINFO_FILES ?= 1 + # Disable ZIP_DEBUGINFO_FILES by default because dtrace tests are + # failing in nightly when the debug info files are ZIP'ed. + ZIP_DEBUGINFO_FILES ?= 0 _JUNK_ := $(shell \ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
--- a/make/windows/makefiles/defs.make Tue May 08 11:37:37 2012 -0700 +++ b/make/windows/makefiles/defs.make Tue May 08 11:40:03 2012 -0700 @@ -143,7 +143,9 @@ MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ZIP_DEBUGINFO_FILES ?= 1 + # Disable ZIP_DEBUGINFO_FILES by default because various tests are + # failing in nightly when the debug info files are ZIP'ed. + ZIP_DEBUGINFO_FILES ?= 0 else ZIP_DEBUGINFO_FILES=0 endif