< prev index next >

test/jdk/tools/jpackage/linux/base/Base.java

Print this page

        

*** 55,69 **** if (folder.exists()) { throw new AssertionError("Error: " + folder.getAbsolutePath() + " exist"); } } private static void init(String name, String ext) { TEST_NAME = name; EXT = ext; if (EXT.equals("rpm")) { ! OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT; } else { OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT; } CMD = new String[]{ "--package-type", EXT, --- 55,80 ---- if (folder.exists()) { throw new AssertionError("Error: " + folder.getAbsolutePath() + " exist"); } } + static String getRpmArch() { + String arch = System.getProperty("os.arch"); // JVM arch + if ("x86".equals(arch)) + return "i386"; + if ("amd64".equals(arch)) + return "x86_64"; + if ("arm".equals(arch)) + return "armv7hl"; + return arch; + } + private static void init(String name, String ext) { TEST_NAME = name; EXT = ext; if (EXT.equals("rpm")) { ! OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + getRpmArch() + "." + EXT; } else { OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT; } CMD = new String[]{ "--package-type", EXT,
< prev index next >