Skip to content

Commit

Permalink
Merge pull request ibmruntimes#860 from keithc-ca/container
Browse files Browse the repository at this point in the history
Rename jtreg property docker.support as container.support
  • Loading branch information
pshipton authored Oct 15, 2024
2 parents ea882cc + f7e8a2c commit d0f338d
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions closed/test/jtreg-ext/requires/OpenJ9PropsExt.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* ===========================================================================
* (c) Copyright IBM Corp. 2019, 2023 All Rights Reserved
* (c) Copyright IBM Corp. 2019, 2024 All Rights Reserved
* ===========================================================================
*
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*
* IBM designates this particular file as subject to the "Classpath" exception
* IBM designates this particular file as subject to the "Classpath" exception
* as provided by IBM in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
Expand All @@ -18,10 +18,8 @@
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
*
* ===========================================================================
*/

package requires;

import java.util.HashMap;
Expand All @@ -33,10 +31,9 @@ public class OpenJ9PropsExt implements Callable<Map<String, String>> {

@Override
public Map<String, String> call() {

Map<String, String> map = new HashMap<>();
try {
map.put("docker.support", "true");
map.put("container.support", "true");
map.put("vm.bits", vmBits());
map.put("vm.cds", "false");
map.put("vm.cds.write.archived.java.heap", "false");
Expand All @@ -58,11 +55,10 @@ public Map<String, String> call() {
map.put("vm.openj9", "true");
map.put("vm.opt.final.ClassUnloading", "true");
map.put("vm.opt.final.ZGenerational", "false");
}
catch (Exception e) {
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
}
}
return map;
}

Expand Down

0 comments on commit d0f338d

Please sign in to comment.