Skip to content

Commit

Permalink
8303822: gtestMain should give more helpful output
Browse files Browse the repository at this point in the history 
Reviewed-by: lmesnik
  • Loading branch information
@MBaesken
MBaesken committed Mar 10, 2023
1 parent e26cc52 commit 0f26d09
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/hotspot/gtest/gtestMain.cpp
View file
Expand Up @@ -245,7 +245,7 @@ static void runUnitTestsInner(int argc, char** argv) {

char* java_home = get_java_home_arg(argc, argv);
if (java_home == NULL) {
fprintf(stderr, "ERROR: You must specify a JDK to use for running the unit tests.\n");
fprintf(stderr, "ERROR: You must specify a JDK (-jdk <image>, --jdk=<image> or -jdk:<image>) to use for running the unit tests.\n");
os::exit(1);
}
#ifndef _WIN32
Expand Down

3 comments on commit 0f26d09

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 0f26d09 Mar 15, 2023

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 0f26d09d to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/hotspot/gtest/gtestMain.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b MBaesken-backport-0f26d09d

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 0f26d09da881b1dfedfc0dcaff46fc169fa1f020

# Backport the commit
$ git cherry-pick --no-commit 0f26d09da881b1dfedfc0dcaff46fc169fa1f020
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 0f26d09da881b1dfedfc0dcaff46fc169fa1f020'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 0f26d09da881b1dfedfc0dcaff46fc169fa1f020.

Please sign in to comment.