Update LinearDumpTests.testInvalidClassFile() and enable CFdumptest

Issue eclipse-openj9#10917 Signed-off-by: Peter Shipton <[email protected]>
pshipton · Aug 11, 2023 · e0a67c7 · e0a67c7
1 parent 67e11c6
commit e0a67c7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/test/functional/VM_Test/playlist.xml b/test/functional/VM_Test/playlist.xml
@@ -148,12 +148,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 	</test>
 	<test>
 		<testCaseName>CFdumptest</testCaseName>
-		<disables>
-			<disable>
-				<comment>excluded OpenJ9 tests</comment>
-			</disable>
-		</disables>
-		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+		<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
 	-cp $(Q)$(TEST_RESROOT)$(D)VM_Test.jar$(P)$(LIB_DIR)$(D)junit4.jar$(Q) \
 	junit.textui.TestRunner com.ibm.j9.cfdump.tests.CfdumpTestSuite; \
 	$(TEST_STATUS)</command>
@@ -163,9 +158,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<groups>
 			<group>functional</group>
 		</groups>
-		<versions>
-			<version>8</version>
-		</versions>
 		<impls>
 			<impl>openj9</impl>
 			<impl>ibm</impl>

diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java
@@ -104,7 +104,6 @@ public void testInvalidClassFile() throws Exception {
 			String[] stringsToFind = new String[] {
 					"Invalid class file:",
 					"Recommended action: throw java.lang.ClassFormatError",
-					"bad magic number"
 			};
 
 			for (String line; (line = in.readLine()) != null && numFound != stringsToFind.length;) {