Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine cmdLineTester_CryptoTest for jdk8 and 11, include osx #4471

Merged
merged 1 commit into from
Jan 28, 2019
Merged

Combine cmdLineTester_CryptoTest for jdk8 and 11, include osx #4471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions test/functional/cmdLineTests/openssl/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
-verbose -explainExcludes -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
<!-- Temporarily exclude on aix until OpenSSL is enabled on aix -->
<!-- Temporarily exclude on osx on jdk8 until https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/98
is fixed. If the issue is fixed, cmdLineTester_CryptoTest and cmdLineTester_CryptoTest_11 can be merged into one. -->
<platformRequirements>^os.aix,^os.osx</platformRequirements>
<platformRequirements>^os.aix</platformRequirements>
<levels>
<level>sanity</level>
</levels>
Expand All @@ -51,32 +49,6 @@
<subset>8</subset>
<subset>9</subset>
<subset>10</subset>
</subsets>
</test>
<test>
<testCaseName>cmdLineTester_CryptoTest_11</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
-DTEST_RESROOT=$(Q)$(TEST_RESROOT)$(D)$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -jar $(CMDLINETESTER_JAR) -config $(Q)$(TEST_RESROOT)$(D)openssl.xml$(Q) \
-verbose -explainExcludes -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
<!-- Temporarily exclude on aix until OpenSSL is enabled on aix -->
<!-- Once https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/98
is fixed for jdk8, cmdLineTester_CryptoTest and cmdLineTester_CryptoTest_11 can be merged into one. -->
<platformRequirements>^os.aix</platformRequirements>
<levels>
<level>sanity</level>
</levels>
<groups>
<group>functional</group>
</groups>
<impls>
<impl>openj9</impl>
</impls>
<subsets>
<subset>11</subset>
</subsets>
</test>
Expand Down