Skip to content

Commit d197e2c

Browse files
annaibmannaibm
committed
Copy getJtreg to shared location
-Moved the getJtreg tar download logic to TKG/scripts/getDependencies.xml resolves : #4848 Signed-off-by: Anna Babu Palathingal <[email protected]>
1 parent 807035e commit d197e2c

File tree

3 files changed

+46
-58
lines changed

3 files changed

+46
-58
lines changed

‎functional/security/Crypto/build.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@
5353
</target>
5454

5555
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
56-
57-
<!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
58-
<target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
59-
</target>
6056

61-
<target name="dist" depends="invokeGetJtreg,getCryptoTest" description="generate the distribution">
57+
<target name="dist" depends="getJtreg,getCryptoTest" description="generate the distribution">
6258
<copy todir="${DEST}">
6359
<fileset dir="${src}" includes="*.xml,*.mk" />
6460
</copy>

‎functional/security/ssl-tests/build.xml

+44-48
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,58 @@
1515
-->
1616

1717
<project name="ssl-tests Security Functional tests" default="build" basedir=".">
18-
<taskdef resource="net/sf/antcontrib/antlib.xml" />
19-
<description>
20-
ssl-tests Security Functional tests
21-
</description>
18+
<taskdef resource="net/sf/antcontrib/antlib.xml" />
19+
<description>
20+
ssl-tests Security Functional tests
21+
</description>
2222

23-
<!-- set global properties for this build -->
24-
<property name="DEST" value="${BUILD_ROOT}/functional/security/ssl-tests" />
23+
<!-- set global properties for this build -->
24+
<property name="DEST" value="${BUILD_ROOT}/functional/security/ssl-tests" />
2525

26-
<!--Properties for this particular build-->
27-
<property name="src" location="./ssl-tests" />
26+
<!--Properties for this particular build-->
27+
<property name="src" location="./ssl-tests" />
2828

29-
<target name="ssltests.check">
30-
<condition property="ssltestsTestdir.exists">
31-
<available file="ssl-tests" type="dir"/>
32-
</condition>
33-
</target>
29+
<target name="ssltests.check">
30+
<condition property="ssltestsTestdir.exists">
31+
<available file="ssl-tests" type="dir"/>
32+
</condition>
33+
</target>
3434

35-
<if>
36-
<contains string="${SPEC}" substring="zos"/>
37-
<then>
38-
<property name="GIT_REPO" value="[email protected]:" />
39-
</then>
40-
<else>
41-
<property name="GIT_REPO" value="https://github.com/" />
42-
</else>
43-
</if>
44-
<target name="getSsltestsTest" depends="ssltests.check" unless="ssltestsTestdir.exists">
45-
<exec executable="git" failonerror="true">
46-
<arg value="clone" />
47-
<arg value="${GIT_REPO}rh-openjdk/ssl-tests.git" />
48-
</exec>
49-
</target>
35+
<if>
36+
<contains string="${SPEC}" substring="zos"/>
37+
<then>
38+
<property name="GIT_REPO" value="[email protected]:" />
39+
</then>
40+
<else>
41+
<property name="GIT_REPO" value="https://github.com/" />
42+
</else>
43+
</if>
44+
<target name="getSsltestsTest" depends="ssltests.check" unless="ssltestsTestdir.exists">
45+
<exec executable="git" failonerror="true">
46+
<arg value="clone" />
47+
<arg value="${GIT_REPO}rh-openjdk/ssl-tests.git" />
48+
</exec>
49+
</target>
5050

51-
<target name="init">
52-
<mkdir dir="${DEST}" />
53-
</target>
51+
<target name="init">
52+
<mkdir dir="${DEST}" />
53+
</target>
5454

55-
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
55+
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
5656

57-
<!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
58-
<target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
59-
</target>
57+
<target name="dist" depends="getJtreg,getSsltestsTest" description="generate the distribution">
58+
<copy todir="${DEST}">
59+
<fileset dir="${src}" includes="*.xml,*.mk" />
60+
</copy>
61+
</target>
6062

61-
<target name="dist" depends="invokeGetJtreg,getSsltestsTest" description="generate the distribution">
62-
<copy todir="${DEST}">
63-
<fileset dir="${src}" includes="*.xml,*.mk" />
64-
</copy>
65-
</target>
63+
<target name="clean" depends="dist" description="clean up">
64+
<!-- Delete the ${build} directory trees -->
65+
<delete dir="${build}" />
66+
</target>
6667

67-
<target name="clean" depends="dist" description="clean up">
68-
<!-- Delete the ${build} directory trees -->
69-
<delete dir="${build}" />
70-
</target>
71-
72-
<target name="build" >
73-
<antcall target="clean" inheritall="true" />
74-
</target>
68+
<target name="build" >
69+
<antcall target="clean" inheritall="true" />
70+
</target>
7571
</project>
7672

‎openjdk/build.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343

4444
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
4545

46-
<!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
47-
<target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
48-
</target>
49-
5046
<target name="getOpenjdk" depends="openjdk-jdk.check" unless="jdkdir.exists">
5147
<!-- Windows API limitation of file paths having 260 characters or fewer,
5248
run the config command to allow file paths of 4096 characters
@@ -242,7 +238,7 @@
242238
</condition>
243239
</target>
244240

245-
<target name="dist" depends="invokeGetJtreg, getOpenjdk" description="generate the distribution">
241+
<target name="dist" depends="getJtreg, getOpenjdk" description="generate the distribution">
246242
<copy todir="${DEST}">
247243
<fileset dir="${src}" includes="*.xml,excludes/ProblemList*.txt,*.mk"/>
248244
</copy>

0 commit comments

Comments
 (0)