8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on RH…

…EL8 and Fedora 27
yaqsun · Oct 17, 2023 · 7d77435 · 7d77435
1 parent a2f982d
commit 7d77435
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
@@ -310,8 +310,7 @@ private Path buildRPM(Map<String, ? super Object> params,
                 // do not use other system directories to build as current user
                 "--define", String.format("%%_topdir %s",
                         TEMP_ROOT.fetchFrom(params).toAbsolutePath()),
-                "--define", String.format("%%_rpmfilename %s", rpmFile.getFileName()),
-                "--define", "_build_id_links none"
+                "--define", String.format("%%_rpmfilename %s", rpmFile.getFileName())
         ).executeExpectSuccess();
 
         Log.verbose(MessageFormat.format(

diff --git a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
@@ -102,6 +102,7 @@ public static void testHardcodedProperties() throws IOException {
                 "License: APPLICATION_LICENSE_TYPE",
                 "Prefix: %{dirname:APPLICATION_DIRECTORY}",
                 "Provides: dont-install-me",
+		"%define _build_id_links none",
                 "%description",
                 "APPLICATION_DESCRIPTION",
                 "%prep",