Merge pull request #17654 from BradleyWood/top

Remove tests with -Xlockword:mode=minimizeFootprint
eclipse-openj9 · Jun 26, 2023 · b034032 · b034032
2 parents 163a514 + d819462
commit b034032
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java
@@ -91,8 +91,7 @@ static void getVMConfig() { /* ideally we should have an mxbean to get this info
 	/**
 	 * Run with both:
 	 * -Xlockword:none,mode=all
-	 * -Xlockword:none,mode=minimizeFootprint
-	 * 
+	 *
 	 */
 
 	@AfterMethod

diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml
@@ -223,11 +223,6 @@
   <return type="success" value="0" />
  </test>
 
-  <test id="-Xlockword minimizeFootprint mode">
-  <command>$EXE$ $CP$ -Xlockword:mode=minimizeFootprint $TARGET$</command>
-  <return type="success" value="0" />
- </test>
-
  <test id="-Xlockword all mode">
   <command>$EXE$ $CP$ -Xlockword:mode=all $TARGET$</command>
   <return type="success" value="0" />

diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml
@@ -31,7 +31,6 @@
 <exclude id="Xnoclassgc" platform=".*_hrt.*" shouldFix="true"><reason>unsupported command line option</reason></exclude>
 <exclude id="-Xlockword bad mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword default mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
-<exclude id="-Xlockword minimizeFootprint mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword all mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option trailing separator" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>

diff --git a/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml b/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml
@@ -34,7 +34,6 @@
 <exclude id="Xnoclassgc" platform=".*_hrt.*" shouldFix="true"><reason>unsupported command line option</reason></exclude>
 <exclude id="-Xlockword bad mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword default mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
-<exclude id="-Xlockword minimizeFootprint mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword all mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option trailing separator" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>

diff --git a/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml b/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml
@@ -34,7 +34,6 @@
 <exclude id="Xnoclassgc" platform=".*_hrt.*" shouldFix="true"><reason>unsupported command line option</reason></exclude>
 <exclude id="-Xlockword bad mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword default mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
-<exclude id="-Xlockword minimizeFootprint mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword all mode" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>
 <exclude id="-Xlockword bad option trailing separator" platform=".*_hrt.*" shouldFix="false"><reason>-Xlockword not supported on hard realtime</reason></exclude>