< prev index next >
jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
Print this page
*** 69,89 ****
ModuleFinder.ofSystem().findAll().stream()
.forEach(this::checkAttributes);
}
! // JMOD files are created with osName and osArch that may be different
! // than os.name and os.arch system property
private boolean checkOSName(String name) {
- if (name.equals(OS_NAME))
- return true;
-
if (OS_NAME.startsWith("Windows")) {
! return name.startsWith("Windows");
! } else {
! System.err.println("ERROR: " + name + " but expected: " + OS_NAME);
! return false;
}
}
private boolean checkOSArch(String name) {
if (name.equals(OS_ARCH))
--- 69,95 ----
ModuleFinder.ofSystem().findAll().stream()
.forEach(this::checkAttributes);
}
! // JMOD files are created with OS name and arch matching the bundle name
private boolean checkOSName(String name) {
if (OS_NAME.startsWith("Windows")) {
! return name.equals("windows");
! }
!
! switch (OS_NAME) {
! case "Linux":
! return name.equals("linux");
! case "SunOS":
! return name.equals("solaris");
! case "Mac OS X":
! return name.equals("macos");
! default:
! // skip validation on unknown platform
! System.out.println("Skip checking OS name in ModuleTarget: " + name);
! return true;
}
}
private boolean checkOSArch(String name) {
if (name.equals(OS_ARCH))
*** 92,105 ****
switch (OS_ARCH) {
case "i386":
case "x86":
return name.equals("x86");
case "amd64":
! return name.equals("x86_64");
default:
! System.err.println("ERROR: " + name + " but expected: " + OS_ARCH);
! return false;
}
}
private void checkAttributes(ModuleReference modRef) {
try {
--- 98,114 ----
switch (OS_ARCH) {
case "i386":
case "x86":
return name.equals("x86");
case "amd64":
! case "i586":
! case "x86_64":
! return name.equals("amd64");
default:
! // skip validation on unknown platform
! System.out.println("Skip checking OS arch in ModuleTarget: " + name);
! return true;
}
}
private void checkAttributes(ModuleReference modRef) {
try {
< prev index next >