test/jdk/tools/jpackage/helpers/JPackagePath.java

@@ -57,11 +57,11 @@
         return getApp("test");
     }
 
     public static String getApp(String name) {
         if (JPackageHelper.isWindows()) {
-            return Path.of("output", name, "bin", name + ".exe").toString();
+            return Path.of("output", name, name + ".exe").toString();
         } else if (JPackageHelper.isOSX()) {
             return Path.of("output", name + ".app",
                     "Contents", "MacOS", name).toString();
         } else if (JPackageHelper.isLinux()) {
             return Path.of("output", name, "bin", name).toString();

@@ -75,11 +75,11 @@
         return getAppIcon("test");
     }
 
     public static String getAppIcon(String name) {
         if (JPackageHelper.isWindows()) {
-            return Path.of("output", name, "bin", name + ".ico").toString();
+            return Path.of("output", name, name + ".ico").toString();
         } else if (JPackageHelper.isOSX()) {
             return Path.of("output", name + ".app",
                     "Contents", "Resources", name + ".icns").toString();
         } else if (JPackageHelper.isLinux()) {
             return Path.of("output", name, "bin", name + ".png").toString();

@@ -93,11 +93,11 @@
         return getAppSL("test", sl);
     }
 
     public static String getAppSL(String app, String sl) {
         if (JPackageHelper.isWindows()) {
-            return Path.of("output", app, "bin", sl + ".exe").toString();
+            return Path.of("output", app, sl + ".exe").toString();
         } else if (JPackageHelper.isOSX()) {
             return Path.of("output", app + ".app",
                     "Contents", "MacOS", sl).toString();
         } else if (JPackageHelper.isLinux()) {
             return Path.of("output", app, "bin", sl).toString();

@@ -195,11 +195,11 @@
                 testName + ".exe").toString();
     }
 
     public static String getWinInstalledApp(String installDir,
             String testName) {
-        return Path.of(getWinProgramFiles(), installDir, "bin",
+        return Path.of(getWinProgramFiles(), installDir,
                 testName + ".exe").toString();
     }
 
     public static String getOSXInstalledApp(String testName) {
         return File.separator + "Applications"

@@ -253,11 +253,10 @@
     }
 
     public static String getWinUserLocalInstalledApp(String testName) {
         return getWinUserLocal()
                 + File.separator + testName
-                + File.separator + "bin"
                 + File.separator + testName + ".exe";
     }
 
     public static String getWinUserLocalInstallFolder(String testName) {
         return getWinUserLocal() + File.separator + testName;