-
Bug
-
Resolution: Fixed
-
P3
-
hs24
-
b12
-
generic
-
windows
-
Not verified
Issue | Fix Version | Assignee | Priority | Status | Resolution | Resolved In Build |
---|---|---|---|---|---|---|
JDK-2225111 | 8 | Daniel Daugherty | P3 | Resolved | Fixed | b41 |
JDK-8018231 | 7u45 | Daniel Daugherty | P3 | Closed | Fixed | b01 |
JDK-8002515 | 7u40 | Daniel Daugherty | P3 | Resolved | Fixed | b01 |
My fix for the following bug:
7169409 3/4 enabling ZIP_DEBUGINFO_FILES causes unexpected test
failures on Windows X86
went thru the JPRT-hotspot west queue and the ZIP_DEBUGINFO_FILES
feature was disabled by default:
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-194957.ddaugher.71
65060_for_hsx24/sourcetree/make/windows/makefiles/defs.make
# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
# Disable ZIP_DEBUGINFO_FILES by default because various tests are
ZIP_DEBUGINFO_FILES ?= 0
ZIP_DEBUGINFO_FILES=0
MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_*_5*product.log
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_x64_5.2-product.log: LP64=1 ARCH=x86 BUILDARCH=amd64 Platform_arch=x86 Platform_arch_model=x86_64 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0"
HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
The next RT_Baseline job went thru the JPRT-east queue and
has the same code:
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-122934.kmcguiga.7168433/sourcetree/make/windows/makefiles/defs.make
# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
# Disable ZIP_DEBUGINFO_FILES by default because various tests are
ZIP_DEBUGINFO_FILES ?= 0
ZIP_DEBUGINFO_FILES=0
MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
But the build logs show that the ZIP_DEBUGINFO_FILES feature
is enabled:
grep ZIP_DEBUGINFO_FILES 2012-05-16-122934.kmcguiga.7168433/logs/windows_*_5*product.log
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_x64_5.2-product.log: LP64=1 ARCH=x86 BUILDARCH=amd64 Platform_arch=x86 Platform_arch_model=x86_64 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
I have been analyzing Keith's job and I cannot find a reason
for the difference.
7169409 3/4 enabling ZIP_DEBUGINFO_FILES causes unexpected test
failures on Windows X86
went thru the JPRT-hotspot west queue and the ZIP_DEBUGINFO_FILES
feature was disabled by default:
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-194957.ddaugher.71
65060_for_hsx24/sourcetree/make/windows/makefiles/defs.make
# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
# Disable ZIP_DEBUGINFO_FILES by default because various tests are
ZIP_DEBUGINFO_FILES ?= 0
ZIP_DEBUGINFO_FILES=0
MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_*_5*product.log
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
2012-05-16-194957.ddaugher.7165060_for_hsx24/logs/windows_x64_5.2-product.log: LP64=1 ARCH=x86 BUILDARCH=amd64 Platform_arch=x86 Platform_arch_model=x86_64 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=0 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\194957.ddaugher\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0"
HOTSPOT_BUILD_VERSION=internal-201205161949.ddaugher.7165060_for_hsx24 product
The next RT_Baseline job went thru the JPRT-east queue and
has the same code:
$ grep ZIP_DEBUGINFO_FILES 2012-05-16-122934.kmcguiga.7168433/sourcetree/make/windows/makefiles/defs.make
# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
# Disable ZIP_DEBUGINFO_FILES by default because various tests are
ZIP_DEBUGINFO_FILES ?= 0
ZIP_DEBUGINFO_FILES=0
MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
But the build logs show that the ZIP_DEBUGINFO_FILES feature
is enabled:
grep ZIP_DEBUGINFO_FILES 2012-05-16-122934.kmcguiga.7168433/logs/windows_*_5*product.log
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_i586_5.1-product.log: ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ARCH=x86 BUILDARCH=i486 Platform_arch=x86 Platform_arch_model=x86_32 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\build\\windows GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
2012-05-16-122934.kmcguiga.7168433/logs/windows_x64_5.2-product.log: LP64=1 ARCH=x86 BUILDARCH=amd64 Platform_arch=x86 Platform_arch_model=x86_64 ENABLE_FULL_DEBUG_SYMBOLS=1 ZIP_DEBUGINFO_FILES=1 RM="rm -f" ZIPEXE=zip JDK_MKTG_VERSION=8.0 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 BUILD_WIN_SA=1 JAVA_HOME=C:\\jprt\\products\\P1\\jdk6u18-fcs\\jdk1.6.0_18 OUTPUTDIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s\\make GAMMADIR=C:\\jprt\\T\\P1\\122934.kmcguiga\\s MAKE_VERBOSE=y HOTSPOT_RELEASE_VERSION=24.0-b10 JRE_RELEASE_VERSION="1.8.0" HOTSPOT_BUILD_VERSION=internal-201205161229.kmcguiga.7168433 product
I have been analyzing Keith's job and I cannot find a reason
for the difference.
- backported by
-
JDK-2225111 conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
-
- Resolved
-
-
JDK-8002515 conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
-
- Resolved
-
-
JDK-8002516 conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
-
- Resolved
-
-
JDK-8018231 conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
-
- Closed
-
- relates to
-
JDK-7169409 enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Windows
-
- Resolved
-