--- old/test/jdk/tools/jpackage/linux/rpm/install.sh 2019-07-16 22:11:43.425177548 +0300 +++ new/test/jdk/tools/jpackage/linux/rpm/install.sh 2019-07-16 22:11:43.112620410 +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