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

Jump to bottom

Migrate testSCCMLTests2 to openj9/test #943

Merged
merged 1 commit into from
Jan 17, 2018
Merged

Migrate testSCCMLTests2 to openj9/test #943

merged 1 commit into from
Jan 17, 2018

Conversation

sophia-guo
Copy link
Contributor

Signed-off-by: Sophia Guo [email protected]

smlambert
smlambert reviewed Jan 16, 2018
View reviewed changes
test/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml Outdated
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<!--
Copyright (c) 2012, 2017 IBM Corp. and others
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to update to 2018

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated. thanks.

test/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml
<variable name="CP_SPEC2000" value="-cp $JVM_TEST_ROOT$$PATHSEP$VM$PATHSEP$specJBB$PATHSEP$SPECjbb2000$PATHSEP$jbb.jar$CPDL$$JVM_TEST_ROOT$$PATHSEP$VM$PATHSEP$specJBB$PATHSEP$SPECjbb2000$PATHSEP$jbb_no_precompile.jar$CPDL$$JVM_TEST_ROOT$$PATHSEP$VM$PATHSEP$specJBB$PATHSEP$SPECjbb2000$PATHSEP$check.jar$CPDL$$JVM_TEST_ROOT$$PATHSEP$VM$PATHSEP$specJBB$PATHSEP$SPECjbb2000$PATHSEP$reporter.jar" />
<variable name="PROGRAM_SPEC2000" value="spec.jbb.JBBmain" />

<variable name="CP_HANOI" value="-cp $UTILSJAR$" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch to remove

test/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml Outdated
$(TEST_STATUS)</command>
<tags>
<tag>extended</tag>
<tag>J9_Local</tag>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the j9_local tag for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure actually. Just moved from original playlist in case it will be needed later. However seem no need anymore. Should I remove it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, remove for now please

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed.

@smlambert
Copy link
Contributor

Jenkins test extended

@sophia-guo
Copy link
Contributor Author

@hangshao0 to work with openj9 successful criteria has been updated to support regex with (java|openjdk) version. Is it good?

@hangshao0
Copy link
Contributor

The same case in ShareClassesCMLTests-1.xml is checking only for version.

<test id="Test 1: Create a cache" timeout="600" runPath="."> <test id="Test 1: Create a cache" timeout="600" runPath="."> <command>$JAVA_EXE$ $currentMode$,reset -version</command> <command>$JAVA_EXE$ $currentMode$,reset -version</command> <output type="success" caseSensitive="yes" regex="no">version</output>

Better to be consistent. You may want to change ShareClassesCMLTests-1.xml to check for (java|openjdk) version as well.

hangshao0
hangshao0 reviewed Jan 16, 2018
View reviewed changes
test/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml

<!-- #### RUN TokenHelperTests SUITE #### -->
<suite id="Shared Classes CommandLineOptionTests Suite - Windows Configuration">

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can " - Windows Configuration" be removed ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or could be leave as is. Those window setup are related with tests with cacheDirPerm sub option, which are in ShareClassesCMLTests-4(5). Together with other variable setting and tests "Start : Cleanup: persistent" and test "Start: Cleanup: nonpersistent" are the common beginning part of all those ShareClassesCMLTests-1//2/3/4/5/6.xml files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what "Windows Configuration" means here. It gives a false impression that the following variables are for Windows only. My preference is to remove it. But I will leave it to you.

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Jan 16, 2018 •
edited
Loading

Checked history all existing commandline tests with "java version" has been updated with "version" by
#353
which make this criteria quite weak. I may open a separate PR to update all these check to use regex to work with java version and openj9.

hangshao0
hangshao0 reviewed Jan 16, 2018
View reviewed changes
test/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml
<variable name="PROGRAM_SPEC2000" value="spec.jbb.JBBmain" />

<variable name="CP_HANOI" value="-cp $UTILSJAR$" />
<variable name="CP_HANOI" value="-cp $UTILSJAR$" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to update the copyright date

@sophia-guo sophia-guo force-pushed the sccm branch 4 times, most recently from 221b68f to c0ddc46 Compare January 16, 2018 20:20
@smlambert smlambert mentioned this pull request Jan 16, 2018
Merged
@smlambert
Copy link
Contributor

Jenkins test extended

@smlambert
Copy link
Contributor

Jenkins test sanity

@smlambert smlambert merged commit 29b1bc6 into eclipse-openj9:master Jan 17, 2018
@sophia-guo sophia-guo deleted the sccm branch January 30, 2019 16:11
@hzongaro hzongaro mentioned this pull request Oct 18, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hangshao0 hangshao0 hangshao0 approved these changes

@smlambert smlambert smlambert approved these changes

Assignees
No one assigned
Labels
comp:test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sophia-guo @smlambert @hangshao0 @pshipton