Skip to content

Conversation

@sendaoYan
Copy link
Member

@sendaoYan sendaoYan commented Mar 4, 2025

Hi all,

This PR fix the makefile bug when there is no gtest 'disable tests' then report syntax error.

Before this PR makefile used below command to get the 'disable tests' number, when there is no 'YOU HAVE [0-9]+ DISABLED TEST' string line in gtest result file gtest.txt, this gawk command will not print anything, so shell report syntax error later.

gawk '/YOU HAVE [0-9]+ DISABLED TEST/ { if (match($0, /[0-9]+/, arr)) { print arr[0]; found=1; } if (!found) { print 0; } }' build/linux-x86_64-server-release/test-results/gtest_Align_server/gtest.txt

After this PR makefile will use below command to get the 'disable tests' number.

gawk '/YOU HAVE [0-9]+ DISABLED TEST/ { if (match($0, /[0-9]+/, arr)) { print arr[0]; found=1; } } END { if (!found) print 0; }' build/linux-x86_64-server-release/test-results/gtest_Align_server/gtest.txt

Additional testing:

  • make test TEST=gtest:Align > test-Alian.log, which return 0 disable test
  • time make test TEST=gtest > test-all.log, which return 15 disable tests

test-all.log
test-Alian.log


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8351138: Running subset of gtests gets error printing result information (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23904/head:pull/23904
$ git checkout pull/23904

Update a local copy of the PR:
$ git checkout pull/23904
$ git pull https://git.openjdk.org/jdk.git pull/23904/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23904

View PR using the GUI difftool:
$ git pr show -t 23904

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23904.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 2025

👋 Welcome back syan! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Mar 4, 2025

@sendaoYan This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8351138: Running subset of gtests gets error printing result information

Reviewed-by: erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 19 new commits pushed to the master branch:

  • caaf409: 8350546: Several java/net/InetAddress tests fails UnknownHostException
  • 062b7c7: 8351115: Test AOTClassLinkingVMOptions.java fails after JDK-8348322
  • a88e8cd: 8350952: Remove some non present files from OPT_SPEED_SRC list
  • de29ef3: 8343191: Cgroup v1 subsystem fails to set subsystem path
  • 75f028b: 8348657: compiler/loopopts/superword/TestEquivalentInvariants.java timed out
  • b1a21b5: 8351101: RISC-V: C2: Small improvement to MacroAssembler::revb
  • 62fa33a: 8351158: Incorrect APX EGPR register save ordering
  • 20ea218: 8336042: Caller/callee param size mismatch in deoptimization causes crash
  • 38b4d46: 8351081: Off-by-one error in ShenandoahCardCluster
  • 29de20d: 8280991: [XWayland] No displayChanged event after setDisplayMode call
  • ... and 9 more: https://git.openjdk.org/jdk/compare/216f113f8b377054bcfccf875ab29e967164d8ab...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 4, 2025
@openjdk
Copy link

openjdk bot commented Mar 4, 2025

@sendaoYan The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Mar 4, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 4, 2025

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

I haven't tested my suggestion here, but this based on how I understand awk.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2025
@sendaoYan
Copy link
Member Author

Thanks @erikj79 for the reviews and suggestions.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 6, 2025

Going to push as commit 4bb3d81.
Since your change was applied there have been 26 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 6, 2025
@openjdk openjdk bot closed this Mar 6, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 6, 2025
@openjdk
Copy link

openjdk bot commented Mar 6, 2025

@sendaoYan Pushed as commit 4bb3d81.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@sendaoYan sendaoYan deleted the jbs8351138 branch March 6, 2025 02:55
@magicus
Copy link
Member

magicus commented Mar 7, 2025

@sendaoYan I missed commenting on this before it was integrated, but should not these disabled tests be counted under the new "SKIPPED" heading instead?

@sendaoYan
Copy link
Member Author

  • time make test TEST=gtest
    I don't quite understand your question. This PR do not change the count logic and test result logic. The test report summary show as:
==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR  SKIP   
   gtest:all/server                                   1101  1086     0     0    15   
==============================
TEST SUCCESS

@magicus
Copy link
Member

magicus commented Mar 10, 2025

Okay, then it's all fine. I misunderstood the code and your patch. Thank you, and apologies.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants