Skip to content

Commit 5b4026b

Browse files
committed
Remove com.test.jlink to eliminate xlC dependency
- Remove com.test.jlink to eliminate xlC dependency in system tests - Remove the build-natives target - Removed setup-native-build-command target related:adoptium/aqa-tests#5965 Signed-off-by: Anna Babu Palathingal <[email protected]>
1 parent 69cfb9d commit 5b4026b

File tree

10 files changed

+2
-577
lines changed

10 files changed

+2
-577
lines changed

openjdk.test.modularity/build.xml

+2-56
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ limitations under the License.
6464
<path path="${openjdk_test_modularity_bin_dir}/common-mods" />
6565
</path>
6666

67-
<target name="build" depends="build-no-natives, build-natives">
67+
<target name="build" depends="build-no-natives">
6868
</target>
6969

7070
<target name="check-compiler-level">
@@ -95,7 +95,7 @@ limitations under the License.
9595
<echo message="can_build_modularity_natives_windows is ${can_build_modularity_natives_windows}"/>
9696
</target>
9797

98-
<target name="build-no-natives" depends="check-prereqs, check-compiler-level, build-java, build-javah">
98+
<target name="build-no-natives" depends="check-prereqs, check-compiler-level, build-java">
9999
</target>
100100

101101
<target name="build-java" depends="check-prereqs, create-bin-dir" if="${can_build_modularity}">
@@ -189,11 +189,6 @@ limitations under the License.
189189
includes="**/*.properties" />
190190
</copy>
191191

192-
<copy todir="${openjdk_test_modularity_bin_dir}/tests/com.test.jlink/conf">
193-
<fileset dir="${openjdk_test_modularity_src_dir}/tests/com.test.jlink/conf"
194-
includes="**/*.properties" />
195-
</copy>
196-
197192
<apply executable="${java_compiler}" failonerror="true" parallel="true">
198193
<arg value="-d" />
199194
<arg value="${openjdk_test_modularity_bin_dir}/common" />
@@ -266,55 +261,6 @@ limitations under the License.
266261
<echo message="openjdk_test_modularity_javac_did_not_run is ${openjdk_test_modularity_javac_did_not_run}" />
267262
</target>
268263

269-
<target name="build-javah" depends="check-prereqs, check-if-javac_ran" unless="javac_did_not_run">
270-
<!-- Build JNI header files. -->
271-
<!--From Java10, the 'javah' executable has been replaced with 'javac with options'. -->
272-
273-
<property name="openjdk_test_modularity_javah_src" value="${openjdk_test_modularity_src_dir}/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java"/>
274-
<property name="openjdk_test_modularity_headerdir" value="${openjdk_test_modularity_jlink_nativedir}/lib"/>
275-
<mkdir dir="${openjdk_test_modularity_headerdir}" />
276-
277-
<!-- First delete the header file -->
278-
<delete includeemptydirs="true" verbose="true">
279-
<fileset dir="${openjdk_test_modularity_headerdir}" includes="adoptopenjdk_test_modularity_jlink_JniTest.h"/>
280-
</delete>
281-
282-
<!-- Then recreate it -->
283-
<echo message="Building JNI header file for JniTest to ${openjdk_test_modularity_headerdir}" />
284-
<exec executable="${java_compiler}" failonerror="true">
285-
<arg value="-classpath"/>
286-
<arg pathref="jlink.project.class.path" />
287-
<arg value="-h"/>
288-
<arg value="${openjdk_test_modularity_headerdir}"/>
289-
<arg value="-d"/>
290-
<arg value="${openjdk_test_modularity_bin_dir}"/>
291-
<arg value="${openjdk_test_modularity_javah_src}"/>
292-
</exec>
293-
</target>
294-
295-
<target name="build-natives" depends="check-prereqs, check-compiler-level, setup-native-build-command, build-natives-windows, build-natives-unix">
296-
</target>
297-
298-
<target name="setup-native-build-command" if="${can_build_modularity}">
299-
<echo message="building natives for java_platform ${java_platform}"/>
300-
<property name="openjdk_test_modularity_native_build_command" value='${setup_windows_build_env}${MAKE} -C ${openjdk_test_modularity_jlink_testcase_src}/native SRC=${openjdk_test_modularity_native_src} JAVA_HOME=${java_home} OUTDIR=${openjdk_test_modularity_jlink_outdir} HEADERDIR=${openjdk_test_modularity_jlink_headerdir} OSNAME=${java_osname}'/>
301-
<tempfile property="openjdk_test_modularity_native_build_command_file" destDir="${java.io.tmpdir}" prefix="openjdk.build.command."/>
302-
</target>
303-
304-
<target name="build-natives-windows" if="${can_build_modularity_natives_windows}">
305-
<echo message="${openjdk_test_modularity_native_build_command}" file="${openjdk_test_modularity_native_build_command_file}.bat"/>
306-
<exec executable="${openjdk_test_modularity_native_build_command_file}.bat" failonerror="true"/>
307-
<delete file="${openjdk_test_modularity_native_build_command_file}.bat" verbose="true"/>
308-
</target>
309-
310-
<target name="build-natives-unix" if="${can_build_modularity_natives_unix}">
311-
<echo message="${openjdk_test_modularity_native_build_command}" file="${openjdk_test_modularity_native_build_command_file}.sh"/>
312-
<exec executable="/bin/sh" failonerror="true">
313-
<arg value="${openjdk_test_modularity_native_build_command_file}.sh"/>
314-
</exec>
315-
<delete file="${openjdk_test_modularity_native_build_command_file}.sh" verbose="true"/>
316-
</target>
317-
318264
<target name="clean">
319265
<delete dir="${openjdk_test_modularity_bin_dir}"/>
320266
</target>

openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestCompress.java

-45
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestExcludeNatives.java

-40
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JlinkPluginTestReleaseInfo.java

-46
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/JniTest.java

-44
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/adoptopenjdk/test/modularity/jlink/PropertyReadTest.java

-32
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/conf/sample.properties

-1
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/module-info.java

-18
This file was deleted.

openjdk.test.modularity/src/tests/com.test.jlink/native/JniTest.c

-46
This file was deleted.

0 commit comments

Comments
 (0)