--- old/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	2019-07-17 23:38:02.097336927 +0300
+++ new/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	2019-07-17 23:38:01.765326233 +0300
@@ -354,12 +354,13 @@
 
     }
 
-    private String getArch() {
-        String arch = System.getProperty("os.arch");
-        if ("i386".equals(arch))
+    private static String getArch() {
+        String arch = System.getProperty("os.arch"); // JVM arch
+        if ("x86".equals(arch))
             return "i386";
-        else
+        if ("x86_64".equals(arch))
             return "amd64";
+        return arch;
     }
 
     private long getInstalledSizeKB(Map<String, ? super Object> params) {
--- old/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	2019-07-17 23:38:02.837360763 +0300
+++ new/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	2019-07-17 23:38:02.501349940 +0300
@@ -127,7 +127,7 @@
 }
 
 void LinuxPlatform::SetCurrentDirectory(TString Value) {
-    chdir(PlatformString(Value).toPlatformString());
+    int ignored = chdir(PlatformString(Value).toPlatformString());
 }
 
 TString LinuxPlatform::GetPackageRootDirectory() {
--- old/src/jdk.jpackage/share/native/libapplauncher/IniFile.cpp	2019-07-17 23:38:03.721389238 +0300
+++ new/src/jdk.jpackage/share/native/libapplauncher/IniFile.cpp	2019-07-17 23:38:03.353377384 +0300
@@ -189,7 +189,7 @@
     bool result = false;
 
     if (FMap.ContainsKey(SectionName) == true) {
-        IniSectionData* section;
+        IniSectionData* section = NULL;
 
         if (FMap.GetValue(SectionName, section) == true && section != NULL) {
             OrderedMap<TString, TString> data = section->GetData();
--- old/src/jdk.jpackage/unix/native/libapplauncher/PosixPlatform.cpp	2019-07-17 23:38:04.517414880 +0300
+++ new/src/jdk.jpackage/unix/native/libapplauncher/PosixPlatform.cpp	2019-07-17 23:38:04.133402509 +0300
@@ -95,7 +95,7 @@
 }
 
 void PosixPlatform::SetCurrentDirectory(TString Value) {
-    chdir(StringToFileSystemString(Value));
+    int ignored = chdir(StringToFileSystemString(Value));
 }
 
 Module PosixPlatform::LoadLibrary(TString FileName) {
@@ -212,10 +212,6 @@
         } else if (count == 0) {
             // break;
         } else {
-            if (buffer[count - 1] == EOF) {
-                buffer[count - 1] = '\0';
-            }
-
             std::list<TString> output = Helpers::StringToArray(buffer);
             FOutput.splice(FOutput.end(), output, output.begin(), output.end());
             result = true;
@@ -310,7 +306,7 @@
 
 void PosixProcess::SetInput(TString Value) {
     if (FInputHandle != 0) {
-        write(FInputHandle, Value.data(), Value.size());
+        ssize_t ignored = write(FInputHandle, Value.data(), Value.size());
     }
 }
 
--- old/test/jdk/tools/jpackage/linux/base/Base.java	2019-07-17 23:38:05.365442198 +0300
+++ new/test/jdk/tools/jpackage/linux/base/Base.java	2019-07-17 23:38:05.045431889 +0300
@@ -57,11 +57,22 @@
         }
     }
 
+    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.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/BundleNameBase.java	2019-07-17 23:38:06.113466297 +0300
+++ new/test/jdk/tools/jpackage/linux/base/BundleNameBase.java	2019-07-17 23:38:05.797456116 +0300
@@ -63,7 +63,7 @@
         BUNDLE_NAME = "jpackage-test-bundle-name";
         EXT = ext;
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + BUNDLE_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + BUNDLE_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + BUNDLE_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/FileAssociationsBase.java	2019-07-17 23:38:06.841489752 +0300
+++ new/test/jdk/tools/jpackage/linux/base/FileAssociationsBase.java	2019-07-17 23:38:06.513479184 +0300
@@ -125,7 +125,7 @@
         EXT = ext;
         TEST_EXT = "jptest1";
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/InstallDirBase.java	2019-07-17 23:38:07.565513079 +0300
+++ new/test/jdk/tools/jpackage/linux/base/InstallDirBase.java	2019-07-17 23:38:07.253503026 +0300
@@ -67,7 +67,7 @@
         TEST_NAME = name;
         EXT = ext;
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/LicenseBase.java	2019-07-17 23:38:08.305536923 +0300
+++ new/test/jdk/tools/jpackage/linux/base/LicenseBase.java	2019-07-17 23:38:07.977526354 +0300
@@ -62,7 +62,7 @@
         TEST_NAME = name;
         EXT = ext;
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/LicenseTypeBase.java	2019-07-17 23:38:09.093562314 +0300
+++ new/test/jdk/tools/jpackage/linux/base/LicenseTypeBase.java	2019-07-17 23:38:08.737550843 +0300
@@ -84,7 +84,7 @@
         EXT = ext;
         JP_LICENSE_TYPE = "JP_LICENSE_TYPE";
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }
--- old/test/jdk/tools/jpackage/linux/base/PackageDepsBase.java	2019-07-17 23:38:10.041592863 +0300
+++ new/test/jdk/tools/jpackage/linux/base/PackageDepsBase.java	2019-07-17 23:38:09.661580618 +0300
@@ -106,8 +106,8 @@
         DEP_NAME = name + "Dep";
         EXT = ext;
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
-            OUTPUT_DEP = "output" + File.separator + DEP_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
+            OUTPUT_DEP = "output" + File.separator + DEP_NAME + "-1.0-1." + Base.getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
             OUTPUT_DEP = "output" + File.separator + DEP_NAME + "-1.0." + EXT;
--- old/test/jdk/tools/jpackage/linux/deb/BundleNameTest.java	2019-07-17 23:38:10.805617484 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/BundleNameTest.java	2019-07-17 23:38:10.481607043 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m BundleNameTest
+ * @run main/othervm/timeout=360 -Xmx512m BundleNameTest
  */
 public class BundleNameTest {
     private static final String TEST_NAME = "BundleNameTest";
--- old/test/jdk/tools/jpackage/linux/deb/FileAssociationsTest.java	2019-07-17 23:38:11.525640689 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/FileAssociationsTest.java	2019-07-17 23:38:11.213630633 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m FileAssociationsTest
+ * @run main/othervm/timeout=360 -Xmx512m FileAssociationsTest
  */
 public class FileAssociationsTest {
     private static final String TEST_NAME = "FileAssociationsTest";
--- old/test/jdk/tools/jpackage/linux/deb/InstallDirTest.java	2019-07-17 23:38:12.233663507 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/InstallDirTest.java	2019-07-17 23:38:11.917653322 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m InstallDirTest
+ * @run main/othervm/timeout=360 -Xmx512m InstallDirTest
  */
 public class InstallDirTest {
     private static final String TEST_NAME = "InstallDirTest";
--- old/test/jdk/tools/jpackage/linux/deb/LicenseTest.java	2019-07-17 23:38:12.933686069 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/LicenseTest.java	2019-07-17 23:38:12.625676142 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m LicenseTest
+ * @run main/othervm/timeout=360 -Xmx512m LicenseTest
  */
 public class LicenseTest {
     private static final String TEST_NAME = "LicenseTest";
--- old/test/jdk/tools/jpackage/linux/deb/MaintainerTest.java	2019-07-17 23:38:13.649709147 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/MaintainerTest.java	2019-07-17 23:38:13.341699219 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m MaintainerTest
+ * @run main/othervm/timeout=360 -Xmx512m MaintainerTest
  */
 public class MaintainerTest {
     private static final String TEST_NAME = "MaintainerTest";
--- old/test/jdk/tools/jpackage/linux/deb/PackageDepsTest.java	2019-07-17 23:38:14.557738415 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/PackageDepsTest.java	2019-07-17 23:38:14.241728230 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm/timeout=240 -Xmx512m PackageDepsTest
+ * @run main/othervm/timeout=420 -Xmx512m PackageDepsTest
  */
 public class PackageDepsTest {
     private static final String TEST_NAME = "PackageDepsTest";
--- old/test/jdk/tools/jpackage/linux/deb/Test.java	2019-07-17 23:38:15.521769491 +0300
+++ new/test/jdk/tools/jpackage/linux/deb/Test.java	2019-07-17 23:38:15.205759304 +0300
@@ -33,7 +33,7 @@
  * @requires (os.family == "linux")
  * @modules jdk.jpackage
  * @modules jdk.jpackage/jdk.jpackage.internal
- * @run main/othervm -Xmx512m Test
+ * @run main/othervm/timeout=300 -Xmx512m Test
  */
 public class Test {
     private static final String TEST_NAME = "Test";
--- old/test/jdk/tools/jpackage/linux/rpm/install.sh	2019-07-17 23:38:16.229792315 +0300
+++ new/test/jdk/tools/jpackage/linux/rpm/install.sh	2019-07-17 23:38:15.917782256 +0300
@@ -1,8 +1,9 @@
-sudo rpm --install fileassociationstest-1.0-1.x86_64.rpm
-sudo rpm --install installdirtest-1.0-1.x86_64.rpm
-sudo rpm --install licensetest-1.0-1.x86_64.rpm
-sudo rpm --install licensetypetest-1.0-1.x86_64.rpm
-sudo rpm --install packagedepstestdep-1.0-1.x86_64.rpm
-sudo rpm --install packagedepstest-1.0-1.x86_64.rpm
-sudo rpm --install test-1.0-1.x86_64.rpm
-sudo rpm --install jpackage-test-bundle-name-1.0-1.x86_64.rpm
+ARCH=$(arch)
+sudo rpm --install fileassociationstest-1.0-1.${ARCH}.rpm
+sudo rpm --install installdirtest-1.0-1.${ARCH}.rpm
+sudo rpm --install licensetest-1.0-1.${ARCH}.rpm
+sudo rpm --install licensetypetest-1.0-1.${ARCH}.rpm
+sudo rpm --install packagedepstestdep-1.0-1.${ARCH}.rpm
+sudo rpm --install packagedepstest-1.0-1.${ARCH}.rpm
+sudo rpm --install test-1.0-1.${ARCH}.rpm
+sudo rpm --install jpackage-test-bundle-name-1.0-1.${ARCH}.rpm