Skip to content

Commit

Permalink
Merge pull request #18332 from keithc-ca/ffm_test_cleanup
Browse files Browse the repository at this point in the history 
Remove unused foreign function and memory tests
  • Loading branch information
@tajila
tajila committed Oct 26, 2023
2 parents 39fd615 + 2aafe3f commit 8f72ea7
Show file tree
Hide file tree
Showing 96 changed files with 15 additions and 60,264 deletions.
66 changes: 15 additions & 51 deletions test/functional/Java16andUp/build.xml
View file
Expand Up @@ -39,17 +39,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<property name="LIB" value="asm,testng,jcommander" />
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml" />

<if>
<equals arg1="${JDK_VERSION}" arg2="16" />
<then>
<!-- Java APIs of JEP389 and related features in Java 16 is incompatible with the APIs in Java17 and beyond -->
<property name="src_160" value="src_160" />
</then>
<else>
<property name="src_160" value="" />
</else>
</if>

<target name="init">
<mkdir dir="${DEST}" />
<mkdir dir="${build}" />
Expand Down Expand Up @@ -99,46 +88,21 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<echo>===debug: on</echo>
<echo>===destdir: ${DEST}</echo>

<if>
<equals arg1="${JDK_VERSION}" arg2="16"/>
<then>
<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
<src path="${src}" />
<src path="${src_160}" />
<src path="${TestUtilities}" />
<exclude name="**/modules/**" />
<compilerarg line='--enable-preview --source ${JDK_VERSION}' />
<compilerarg line='--add-modules jdk.incubator.foreign' />
<compilerarg line='--add-opens jdk.incubator.foreign/jdk.internal.foreign=ALL-UNNAMED' />
<compilerarg line='--add-exports java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/java.lang=ALL-UNNAMED' />
<classpath>
<pathelement location="${LIB_DIR}/testng.jar" />
<pathelement location="${LIB_DIR}/jcommander.jar" />
<pathelement location="${LIB_DIR}/asm.jar" />
<pathelement location="${build}" />
</classpath>
</javac>
</then>
<else>
<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
<src path="${src}" />
<src path="${TestUtilities}" />
<exclude name="**/modules/**" />
<compilerarg line='--enable-preview --source ${JDK_VERSION}' />
<compilerarg line='--add-exports java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/java.lang=ALL-UNNAMED' />
<classpath>
<pathelement location="${LIB_DIR}/testng.jar" />
<pathelement location="${LIB_DIR}/jcommander.jar" />
<pathelement location="${LIB_DIR}/asm.jar" />
<pathelement location="${build}" />
</classpath>
</javac>
</else>
</if>
<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
<src path="${src}" />
<src path="${TestUtilities}" />
<exclude name="**/modules/**" />
<compilerarg line='--enable-preview --source ${JDK_VERSION}' />
<compilerarg line='--add-exports java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/jdk.internal.misc=ALL-UNNAMED' />
<compilerarg line='--add-opens java.base/java.lang=ALL-UNNAMED' />
<classpath>
<pathelement location="${LIB_DIR}/testng.jar" />
<pathelement location="${LIB_DIR}/jcommander.jar" />
<pathelement location="${LIB_DIR}/asm.jar" />
<pathelement location="${build}" />
</classpath>
</javac>
</target>

<target name="dist" depends="compile,compile_modules" description="generate the distribution">
Expand Down
95 changes: 0 additions & 95 deletions test/functional/Java16andUp/playlist.xml
View file
Expand Up @@ -138,99 +138,4 @@
<version>16+</version>
</versions>
</test>

<test>
<testCaseName>CloseScope0Tests</testCaseName>
<disables>
<disable>
<comment>https://github.com/eclipse-openj9/openj9/issues/14028#issuecomment-988225623</comment>
<impl>hotspot</impl>
</disable>
</disables>
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
--add-opens jdk.incubator.foreign/jdk.internal.foreign=ALL-UNNAMED \
--add-opens java.base/jdk.internal.misc=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED \
--add-modules jdk.incubator.foreign \
-cp $(Q)$(LIB_DIR)$(D)asm.jar$(P)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng_160.xml$(Q) \
-testnames CloseScope0Tests \
-groups $(TEST_GROUP) \
-excludegroups $(DEFAULT_EXCLUDE); \
$(TEST_STATUS)
</command>
<levels>
<level>sanity</level>
</levels>
<groups>
<group>functional</group>
</groups>
<versions>
<version>16</version>
</versions>
</test>

<test>
<testCaseName>Jep389Tests_testClinkerFfi_DownCall</testCaseName>
<disables>
<disable>
<comment>https://github.com/eclipse-openj9/openj9/issues/14028#issuecomment-988225623</comment>
<impl>hotspot</impl>
</disable>
</disables>
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
--add-modules jdk.incubator.foreign \
-Dforeign.restricted=permit \
-cp $(Q)$(LIB_DIR)$(D)asm.jar$(P)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng_160.xml$(Q) -testnames Jep389Tests_testClinkerFfi_DownCall \
-groups $(TEST_GROUP) \
-excludegroups $(DEFAULT_EXCLUDE); \
$(TEST_STATUS)
</command>
<platformRequirements>bits.64,^arch.riscv,^os.zos,^os.sunos,^arch.arm,^os.osx</platformRequirements>
<levels>
<level>sanity</level>
</levels>
<groups>
<group>functional</group>
</groups>
<impls>
<impl>openj9</impl>
</impls>
<versions>
<version>16</version>
</versions>
</test>

<test>
<testCaseName>Jep389Tests_testClinkerFfi_VaList</testCaseName>
<disables>
<disable>
<comment>https://github.com/eclipse-openj9/openj9/issues/14028#issuecomment-988225623</comment>
<impl>hotspot</impl>
</disable>
</disables>
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
--add-modules jdk.incubator.foreign \
-Dforeign.restricted=permit \
-cp $(Q)$(LIB_DIR)$(D)asm.jar$(P)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng_160.xml$(Q) -testnames Jep389Tests_testClinkerFfi_VaList \
-groups $(TEST_GROUP) \
-excludegroups $(DEFAULT_EXCLUDE); \
$(TEST_STATUS)
</command>
<platformRequirements>bits.64,^arch.ppc,^arch.390,^arch.riscv,^os.zos,^os.sunos,^arch.arm,^os.osx</platformRequirements>
<levels>
<level>sanity</level>
</levels>
<groups>
<group>functional</group>
</groups>
<impls>
<impl>openj9</impl>
</impls>
<versions>
<version>16</version>
</versions>
</test>
</playlist>
187 changes: 0 additions & 187 deletions test/functional/Java16andUp/src_160/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java
View file

This file was deleted.

0 comments on commit 8f72ea7

Please sign in to comment.