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

Automate multijvm compiler tck #4193

Merged
merged 1 commit into from
Jan 25, 2023
Merged

Automate multijvm compiler tck #4193

merged 1 commit into from
Jan 25, 2023

Conversation

Mesbah-Alam
Copy link
Contributor

@Mesbah-Alam Mesbah-Alam commented Dec 8, 2022 •
edited
Loading

This PR Automates multijvm compiler tck :

  1. Changes in mk:
    • Defined commands to generate jtb, start agent, start harness on remote node.
    • Broke down compiler tests to subgroups.
  2. Changes in playlist.xml :
    • MultiJVM compiler test targets added with xxx_multijvm suffix, using dev level.
  3. JavaTestUtil: Generates command jtb file and summary report.
  4. agent-drive.sh: Aids in running harness and agent processes and kills agent once done.
  5. Jenkinsfilebase: When running tcks, call runTest() with Jenkins credentials, as needed for remote node connection.

Related : backlog/issues/957.

Signed-off-by: Mesbah-Alam [email protected]

@Mesbah-Alam
Copy link
Contributor Author

Mesbah-Alam commented Dec 8, 2022 •
edited
Loading

Test multijvm mode with dev.jck : Grinder_JCK/1017.
Test regular mode with sanity.jck: Grinder_JCK/1018.
Test regular mode with extended.jck: Grinder_JCK/1024.
Test a non-jck build with MiniMix_5m: Grinder_JCK/1019.

@Mesbah-Alam Mesbah-Alam force-pushed the try-clinet-server branch 13 times, most recently from 2b8a293 to c736e91 Compare December 21, 2022 18:25
@Mesbah-Alam Mesbah-Alam force-pushed the try-clinet-server branch 7 times, most recently from 9f3d46b to ca5437b Compare January 9, 2023 21:49
@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review January 10, 2023 16:29
llxia
llxia reviewed Jan 10, 2023
View reviewed changes
jck/compiler.api/playlist.xml
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(GEN_JTB) tests=api/java_rmi testsuite=COMPILER'; \
Copy link
Contributor

Choose a reason for hiding this comment

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

There is ' at the end. Is it intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is. The corresponding quote can be found in GEN_JTB definition under jck.mk.

jck/jck.mk

COMPILER_LANG_EXPR_TESTS_GROUP10=$(Q)lang/EXPR/expr463;lang/EXPR/expr497;lang/EXPR/expr490;lang/EXPR/expr232;lang/EXPR/expr340;lang/EXPR/expr172;lang/EXPR/expr516;lang/EXPR/expr724;lang/EXPR/expr186;lang/EXPR/expr529;lang/EXPR/expr181;lang/EXPR/expr175;lang/EXPR/expr347;lang/EXPR/expr378;lang/EXPR/expr385;lang/EXPR/expr143;lang/EXPR/expr371;lang/EXPR/expr715;lang/EXPR/expr527;lang/EXPR/expr188;lang/EXPR/expr518;lang/EXPR/expr520;lang/EXPR/expr712;lang/EXPR/expr376;lang/EXPR/expr144;lang/EXPR/expr382;lang/EXPR/expr349;lang/EXPR/expr746;lang/EXPR/expr110;lang/EXPR/expr322;lang/EXPR/expr128;lang/EXPR/expr325;lang/EXPR/expr117;lang/EXPR/expr748;lang/EXPR/expr777;lang/EXPR/expr313;lang/EXPR/expr121;lang/EXPR/expr119$(Q)
COMPILER_LANG_EXPR_TESTS_GROUP11=$(Q)lang/EXPR/expr126;lang/EXPR/expr314;lang/EXPR/expr383;lang/EXPR/expr713;lang/EXPR/expr377;lang/EXPR/expr348;lang/EXPR/expr370;lang/EXPR/expr142;lang/EXPR/expr526;lang/EXPR/expr384;lang/EXPR/expr189;lang/EXPR/expr346;lang/EXPR/expr174;lang/EXPR/expr180;lang/EXPR/expr379;lang/EXPR/expr187;lang/EXPR/expr173;lang/EXPR/expr341;lang/EXPR/expr517;lang/EXPR/expr528;lang/EXPR/expr118;lang/EXPR/expr315;lang/EXPR/expr127;lang/EXPR/expr749;lang/EXPR/expr120;lang/EXPR/expr312;lang/EXPR/expr129;lang/EXPR/expr116;lang/EXPR/expr324;lang/EXPR/expr747;lang/EXPR/expr323;lang/EXPR/expr111$(Q)

Copy link
Contributor

Choose a reason for hiding this comment

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

Will this affect the original test that uses COMPILER_LANG_EXPR_TESTS_GROUP10?

Copy link
Contributor Author

@Mesbah-Alam Mesbah-Alam Jan 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks for spotting @llxia. Added a new targetjck-compiler-lang-EXPR-group11 under compiler.lang/playlist.xml to run the tests in COMPILER_LANG_EXPR_TESTS_GROUP11 in regular mode. This is the only new group which impacts the regular targets however. The rest of the new subgroups added in this PR only apply to multijvm targets (e.g. COMPILER_LANG_CONV_TESTS_GROUP1 is only used in target jck-compiler-lang-CONV-group1_multijvm. The corresponding target for regular mode, jck-compiler-lang-CONV, does not use the broken down approach but runs everything under lang/CONV).

llxia
llxia reviewed Jan 18, 2023
View reviewed changes
jck/compiler.api/playlist.xml Outdated
<version>11</version>
<version>12</version>
<version>13</version>
<version>14</version>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please just set 8 and 11

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!

llxia
llxia approved these changes Jan 24, 2023
View reviewed changes
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

@smlambert
Copy link
Contributor

Quick test on JDK8 x86-64_linux in TC_Grinder/3118

smlambert
smlambert approved these changes Jan 25, 2023
View reviewed changes
Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

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

Looks good, thanks @Mesbah-Alam !

@smlambert smlambert merged commit 52caa06 into adoptium:master Jan 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@llxia llxia llxia approved these changes

@smlambert smlambert smlambert approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mesbah-Alam @smlambert @llxia