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.

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

Update TAP information for jck tests #504

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Conversation

sophia-guo
Copy link
Contributor

Update failed test target output parse in tap file to avoid the information cut and missing
Update jck test cases failed information to be the same way as openjdk tests for diagnostic=failure

Close adoptium/aqa-tests#439

Update to add all test output information if diagnostic is 'all'
Filter and summarize failure tests in a similar way to openjdk tests

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
@sophia-guo
Copy link
Contributor Author

Grinder:
temurin-compliance/job/Grinder/4087/

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.

thanks @sophia-guo !

@sophia-guo
Copy link
Contributor Author

Update won't affect jdk tap files Grinder for jdk_custom still works fine https://ci.adoptium.net/job/Grinder/8992/
Grinder triggered by rerun link works fine https://ci.adoptium.net/job/Grinder/8993/

@@ -159,10 +159,31 @@ sub resultReporter {
$numOfTotal++;
$tapString .= "not ok " . $numOfTotal . " - " . $testName . "\n";
$tapString .= " ---\n";
if (($diagnostic eq 'failure') || ($diagnostic eq 'all')) {
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 diagnostic used for? And why remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See line 181.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we change the logic to the following?

if (($diagnostic eq 'failure') || ($diagnostic eq 'all')) {
    if ($buildList =~ /jck/) {...}
    elsif ($buildList =~ /openjdk/) {...}
    else {..}
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is to parse, filter and record the failed test case name to a formatted tap file. Only make sense for diagnotic=failure. No need to do for diagnostic=noDetail and dianostic=all

Copy link
Contributor

Choose a reason for hiding this comment

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

sure, we do not need to check for dianostic=all. The current if else block at line 181 is confusing.

Copy link
Contributor Author

@sophia-guo sophia-guo Feb 29, 2024

Choose a reason for hiding this comment

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

Yes, the negation is normally difficult to understand. However, the way you mentioned would make the majority of code (current else block) confusing because extra if else would be needed, which is not straightforward.

Copy link
Contributor Author

@sophia-guo sophia-guo Feb 29, 2024

Choose a reason for hiding this comment

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

I can update to

if (($diagnostic eq 'failure') && ($buildList =~ /jck/ || $buildList =~ /openjdk/)) {
} else {
}

The difference would be the longer code block under the if branch and the one-liners of an exception move to else branch. Initially I think it may be more readable to keep the longer code block under the else branch. But I'm ok with the change.

@smlambert
Copy link
Contributor

Seems like this review is being held up over differing preferences for code style and readability.

Given the related aqa-tests PR is merged (before this PR which it depends on), can we proceed to bring this in and update style later? I am worried to hit a bunch of test jobs failing tonight otherwise. ?

I am also, waiting on this to merge before creating tags and release branch.

@llxia
Copy link
Contributor

llxia commented Mar 1, 2024

sigh, I did not notice adoptium/aqa-tests#5106 was merged despite there being the Depends on message in the description.

I merge this in to unblock other activities.

@llxia llxia merged commit 3388788 into adoptium:master Mar 1, 2024
3 checks passed
@smlambert
Copy link
Contributor

thanks @llxia ! I will proceed with adoptium/aqa-tests#5549 now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants