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

*** 20,29 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  import java.io.File;
+ import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  
  public class Base {
  
*** 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,
--- 56,80 ----
          if (folder.exists()) {
              throw new AssertionError("Error: " + folder.getAbsolutePath() + " exist");
          }
      }
  
!     static String getRpmArch() throws Exception {
!         File out = File.createTempFile("rpmbuild", ".out");
!         out.deleteOnExit();
!         int code = JPackageHelper.execute(out, "rpmbuild", "-E=%{_target_cpu}");
!         if (code != 0) {
!             throw new AssertionError("Error: unable to get rpm arch");
!         }
!         return Files.readAllLines(out.toPath()).get(0);
!     }
! 
!     private static void init(String name, String ext) throws Exception {
          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,