stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8277806: 4 tools/jar failures per platform after JDK-8272728

Browse Source 
Reviewed-by: alanb, jjg
This commit is contained in:
Lance Andersen 2021-11-24 20:42:29 +00:00
parent e785f69961
commit b5841ba3f3
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/jdk/tools/jar/modularJar/Basic.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2021, 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
@ -1093,9 +1093,6 @@ public class Basic {
{ {
List<String> commands = new ArrayList<>(); List<String> commands = new ArrayList<>();
if (!TOOL_VM_OPTIONS.isEmpty()) {
commands.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
}
commands.add("-d"); commands.add("-d");
commands.add(dest.toString()); commands.add(dest.toString());
if (dest.toString().contains("bar")) { if (dest.toString().contains("bar")) {

3
test/jdk/tools/jar/multiRelease/MRTestBase.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2021, 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
@ -108,7 +108,6 @@ public class MRTestBase {
if (!opts.isEmpty()) { if (!opts.isEmpty()) {
commands.addAll(Arrays.asList(opts.split(" +"))); commands.addAll(Arrays.asList(opts.split(" +")));
} }
commands.addAll(Utils.getForwardVmOptions());
commands.add("-d"); commands.add("-d");
commands.add(dest.toString()); commands.add(dest.toString());
Stream.of(sourceFiles) Stream.of(sourceFiles)