Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jdk17u
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
openjdk
jdk17u
Commits
4c89a63a
Commit
4c89a63a
authored
6 months ago
by
Goetz Lindenmaier
Browse files
Options
Downloads
Patches
Plain Diff
8334057: JLinkReproducibleTest.java support receive test.tool.vm.opts
Backport-of: 8feabc849ba2f617c8c6dbb2ec5074297beb6437
parent
ead94467
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/jdk/tools/jlink/JLinkReproducibleTest.java
+7
-1
7 additions, 1 deletion
test/jdk/tools/jlink/JLinkReproducibleTest.java
with
7 additions
and
1 deletion
test/jdk/tools/jlink/JLinkReproducibleTest.java
+
7
−
1
View file @
4c89a63a
/*
/*
* Copyright (c) 2018, 20
19
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 20
24
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -37,6 +37,9 @@ import jdk.test.lib.process.ProcessTools;
...
@@ -37,6 +37,9 @@ import jdk.test.lib.process.ProcessTools;
* @run driver JLinkReproducibleTest
* @run driver JLinkReproducibleTest
*/
*/
public
class
JLinkReproducibleTest
{
public
class
JLinkReproducibleTest
{
private
static
final
String
TOOL_VM_OPTIONS
=
System
.
getProperty
(
"test.tool.vm.opts"
,
""
);
private
static
void
run
(
List
<
String
>
cmd
)
throws
Exception
{
private
static
void
run
(
List
<
String
>
cmd
)
throws
Exception
{
var
pb
=
new
ProcessBuilder
(
cmd
.
toArray
(
new
String
[
0
]));
var
pb
=
new
ProcessBuilder
(
cmd
.
toArray
(
new
String
[
0
]));
var
res
=
ProcessTools
.
executeProcess
(
pb
);
var
res
=
ProcessTools
.
executeProcess
(
pb
);
...
@@ -46,6 +49,9 @@ public class JLinkReproducibleTest {
...
@@ -46,6 +49,9 @@ public class JLinkReproducibleTest {
private
static
void
jlink
(
Path
image
,
boolean
with_default_trace_file
)
throws
Exception
{
private
static
void
jlink
(
Path
image
,
boolean
with_default_trace_file
)
throws
Exception
{
var
cmd
=
new
ArrayList
<
String
>();
var
cmd
=
new
ArrayList
<
String
>();
cmd
.
add
(
JDKToolFinder
.
getJDKTool
(
"jlink"
));
cmd
.
add
(
JDKToolFinder
.
getJDKTool
(
"jlink"
));
if
(!
TOOL_VM_OPTIONS
.
isEmpty
())
{
cmd
.
addAll
(
Arrays
.
asList
(
TOOL_VM_OPTIONS
.
split
(
"\\s+"
,
-
1
)));
}
cmd
.
addAll
(
List
.
of
(
cmd
.
addAll
(
List
.
of
(
"--module-path"
,
JMODS_DIR
.
toString
()
+
File
.
pathSeparator
+
CLASS_DIR
.
toString
(),
"--module-path"
,
JMODS_DIR
.
toString
()
+
File
.
pathSeparator
+
CLASS_DIR
.
toString
(),
"--add-modules"
,
"main"
,
"--add-modules"
,
"main"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment