8339834: Replace usages of -mx and -ms in some tests

Reviewed-by: aivanov, ascarpino, prr, dholmes

Author: jaikiran

src/java.base/share/classes/sun/security/util/Cache.java

@@ -59,7 +59,7 @@
  * However, note that because of the way SoftReferences are implemented in
  * HotSpot at the moment, this may not work perfectly as it clears them fairly
  * eagerly. Performance may be improved if the Java heap size is set to larger
- * value using e.g. java -ms64M -mx128M foo.Test
+ * value using e.g. java -Xms64M -Xmx128M foo.Test
  *
  * Cache sizing: the memory cache is implemented on top of a LinkedHashMap.
  * In its current implementation, the number of buckets (NOT entries) in

test/hotspot/jtreg/resourcehogs/compiler/intrinsics/string/TestStringIntrinsics2LargeArray.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +35,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
  * @run main/othervm
- *        -mx8G
+ *        -Xmx8G
  *        -Xbootclasspath/a:.
  *        -Xmixed
  *        -XX:+UnlockDiagnosticVMOptions

test/jdk/java/beans/Introspector/8159696/UnloadClassBeanInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * @bug 8159696
  * @library /javax/swing/regtesthelpers
  * @compile ./stub/Stub.java
- * @run main/othervm -mx32M UnloadClassBeanInfo
+ * @run main/othervm -Xmx32M UnloadClassBeanInfo
  */
 public class UnloadClassBeanInfo {
 

test/jdk/java/beans/Introspector/Test5102804.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 5102804
  * @summary Tests memory leak
- * @author Sergey Malenkov
- * @run main/othervm -ms16m -mx16m Test5102804
+ * @run main/othervm -Xms16m -Xmx16m Test5102804
  */
 
 import java.beans.BeanInfo;

test/jdk/java/beans/Introspector/Test8027905.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @test
  * @bug 8027905
  * @summary Tests that GC does not affect a property type
- * @author Sergey Malenkov
- * @run main/othervm -mx16m Test8027905
+ * @run main/othervm -Xmx16m Test8027905
  */
 
 public class Test8027905 {

test/jdk/java/beans/XMLEncoder/Test4646747.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test
  * @bug 4646747
  * @summary Tests that persistence delegate is correct after memory stress
- * @author Mark Davidson
- * @run main/othervm -ms16m -mx16m Test4646747
+ * @run main/othervm -Xms16m -Xmx16m Test4646747
  */
 
 import java.beans.DefaultPersistenceDelegate;

test/jdk/java/lang/ref/SoftReference/Pin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,7 @@
 /* @test
  * @bug 4076287
  * @summary Invoking get on a SoftReference shouldn't pin the referent
- * @run main/othervm -ms16m -mx16m Pin
- * @author Peter Jones
- * @author Mark Reinhold
+ * @run main/othervm -Xms16m -Xmx16m Pin
  */
 
 

test/jdk/java/nio/Buffer/Chew.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Ensure that direct memory can be unreserved
  *          as the reserving thread sleeps
  *
- * @run main/othervm -mx16M Chew
+ * @run main/othervm -Xmx16M Chew
  */
 
 import java.nio.*;

test/jdk/tools/jimage/JImageToolTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
 public class JImageToolTest {
     private static void jimage(String... jimageArgs) throws Exception {
         ArrayList<String> args = new ArrayList<>();
-        args.add("-ms64m");
+        args.add("-Xms64m");
         args.add("jdk.tools.jimage.Main");
         args.addAll(Arrays.asList(jimageArgs));