stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8287401: jpackage tests failing on Windows due to powershell issue

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2022-06-16 22:04:17 +00:00
parent ff3db52044
commit c254c9d095
1 changed files with 5 additions and 8 deletions

13
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java

@ -28,7 +28,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
public final class LauncherIconVerifier {
@ -136,18 +135,16 @@ public final class LauncherIconVerifier {
private Path extractIconFromExecutable(Path outputDir, Path executable,
String label) {
Path psScript = outputDir.resolve(label + ".ps1");
Path extractedIcon = outputDir.resolve(label + ".bmp");
TKit.createTextFile(psScript, List.of(
String script = String.join(";",
"[System.Reflection.Assembly]::LoadWithPartialName('System.Drawing')",
String.format(
"[System.Drawing.Icon]::ExtractAssociatedIcon(\"%s\").ToBitmap().Save(\"%s\", [System.Drawing.Imaging.ImageFormat]::Bmp)",
"[System.Drawing.Icon]::ExtractAssociatedIcon('%s').ToBitmap().Save('%s', [System.Drawing.Imaging.ImageFormat]::Bmp)",
executable.toAbsolutePath().normalize(),
extractedIcon.toAbsolutePath().normalize()),
"exit 0"));
extractedIcon.toAbsolutePath().normalize()));
Executor.of("powershell", "-NoLogo", "-NoProfile", "-File",
psScript.toAbsolutePath().normalize().toString()).execute();
Executor.of("powershell", "-NoLogo", "-NoProfile", "-Command",
script).execute();
return extractedIcon;
}