Skip to content

Commit 11e5175

Browse files
jasonkatonicajasonkatonica
authored
Add new dependencies required for OpenJCEPlus tests (adoptium#5452)
The OpenJCEPlus tests require a new test dependency for interop testing with bouncy castle. Signed-off-by: Jason Katonica <katonica@us.ibm.com>
1 parent c72ef0c commit 11e5175

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

‎functional/OpenJcePlusTests/build.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<!--Properties for this particular build-->
2727
<property name="src" location="./OpenJCEPlus/src/" />
2828
<property name="build" location="./bin" />
29-
<property name="LIB" value="junit4,hamcrest_core,bcprov_jdk18on,junit_vintage_engine,junit_platform_suite,junit_jupiter_api,junit_jupiter_engine,junit_jupiter_params,junit_platform_suite_api"/>
29+
<property name="LIB" value="junit4,hamcrest_core,bcprov_jdk18on,bcpkix-jdk18on,bcprov-ext-jdk18on,junit_vintage_engine,junit_platform_suite,junit_jupiter_api,junit_jupiter_engine,junit_jupiter_params,junit_platform_suite_api"/>
3030
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
3131
<property environment="env" />
3232

@@ -121,6 +121,8 @@
121121
<pathelement location="${LIB_DIR}/junit4.jar" />
122122
<pathelement location="${LIB_DIR}/hamcrest-core.jar" />
123123
<pathelement location="${LIB_DIR}/bcprov-jdk18on.jar" />
124+
<pathelement location="${LIB_DIR}/bcprov-ext-jdk18on.jar" />
125+
<pathelement location="${LIB_DIR}/bcpkix-jdk18on.jar" />
124126
<pathelement location="${LIB_DIR}/junit-vintage-engine.jar" />
125127
<pathelement location="${LIB_DIR}/junit-platform-suite.jar" />
126128
<pathelement location="${LIB_DIR}/junit-jupiter-api.jar" />
@@ -141,6 +143,8 @@
141143
<fileset dir="${LIB_DIR}/" includes="junit4.jar" />
142144
<fileset dir="${LIB_DIR}/" includes="hamcrest-core.jar" />
143145
<fileset dir="${LIB_DIR}/" includes="bcprov-jdk18on.jar" />
146+
<fileset dir="${LIB_DIR}/" includes="bcprov-ext-jdk18on.jar" />
147+
<fileset dir="${LIB_DIR}/" includes="bcpkix-jdk18on.jar" />
144148
<fileset dir="${LIB_DIR}/" includes="junit-vintage-engine.jar" />
145149
<fileset dir="${LIB_DIR}/" includes="junit-platform-suite.jar" />
146150
<fileset dir="${LIB_DIR}/" includes="junit-jupiter-api.jar" />

‎functional/OpenJcePlusTests/test.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@
4343
</java>
4444
</target>
4545
<target name="test">
46-
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMemStressAll" />
46+
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMemStressAll" />
4747
<junit fork="yes" printsummary="on" showoutput="yes" haltonfailure="yes">
4848
<jvmarg line="--add-exports=java.base/sun.security.util=ALL-UNNAMED" />
4949
<jvmarg line="--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED" />
5050
<classpath>
5151
<pathelement location="junit4.jar" />
5252
<pathelement location="hamcrest-core.jar" />
5353
<pathelement location="bcprov-jdk18on.jar" />
54+
<pathelement location="bcprov-ext-jdk18on.jar" />
55+
<pathelement location="bcpkix-jdk18on.jar" />
5456
<pathelement location="openjceplus-tests.jar" />
5557
<pathelement location="junit-vintage-engine.jar" />
5658
<pathelement location="junit-platform-suite.jar" />
@@ -63,14 +65,16 @@
6365
<test name="ibm.jceplus.junit.TestMemStressAll" todir="junitreports"/>
6466
</junit>
6567
<echo message="TestMemStressAll COMPLETED" />
66-
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThread" />
68+
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThread" />
6769
<junit fork="yes" printsummary="on" showoutput="yes" haltonfailure="yes">
6870
<jvmarg line="--add-exports=java.base/sun.security.util=ALL-UNNAMED" />
6971
<jvmarg line="--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED" />
7072
<classpath>
7173
<pathelement location="junit4.jar" />
7274
<pathelement location="hamcrest-core.jar" />
7375
<pathelement location="bcprov-jdk18on.jar" />
76+
<pathelement location="bcprov-ext-jdk18on.jar" />
77+
<pathelement location="bcpkix-jdk18on.jar" />
7478
<pathelement location="openjceplus-tests.jar" />
7579
<pathelement location="junit-vintage-engine.jar" />
7680
<pathelement location="junit-platform-suite.jar" />
@@ -83,14 +87,16 @@
8387
<test name="ibm.jceplus.junit.TestMultithread" todir="junitreports"/>
8488
</junit>
8589
<echo message="TestMultithread COMPLETED" />
86-
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThreadFIPS" />
90+
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThreadFIPS" />
8791
<junit fork="yes" printsummary="on" showoutput="yes" haltonfailure="yes">
8892
<jvmarg line="--add-exports=java.base/sun.security.util=ALL-UNNAMED" />
8993
<jvmarg line="--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED" />
9094
<classpath>
9195
<pathelement location="junit4.jar" />
9296
<pathelement location="hamcrest-core.jar" />
9397
<pathelement location="bcprov-jdk18on.jar" />
98+
<pathelement location="bcprov-ext-jdk18on.jar" />
99+
<pathelement location="bcpkix-jdk18on.jar" />
94100
<pathelement location="openjceplus-tests.jar" />
95101
<pathelement location="junit-vintage-engine.jar" />
96102
<pathelement location="junit-platform-suite.jar" />
@@ -103,14 +109,16 @@
103109
<test name="ibm.jceplus.junit.TestMultithreadFIPS" todir="junitreports"/>
104110
</junit>
105111
<echo message="TestMultithreadFIPS COMPLETED" />
106-
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestAll" />
112+
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestAll" />
107113
<junit fork="yes" printsummary="on" showoutput="yes" haltonfailure="yes">
108114
<jvmarg line="--add-exports=java.base/sun.security.util=ALL-UNNAMED" />
109115
<jvmarg line="--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED" />
110116
<classpath>
111117
<pathelement location="junit4.jar" />
112118
<pathelement location="hamcrest-core.jar" />
113119
<pathelement location="bcprov-jdk18on.jar" />
120+
<pathelement location="bcprov-ext-jdk18on.jar" />
121+
<pathelement location="bcpkix-jdk18on.jar" />
114122
<pathelement location="openjceplus-tests.jar" />
115123
<pathelement location="junit-vintage-engine.jar" />
116124
<pathelement location="junit-platform-suite.jar" />

0 commit comments

Comments
 (0)