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

Run some tests on Java 11 #299

Merged
merged 10 commits into from
Dec 18, 2020
Merged

Run some tests on Java 11 #299

merged 10 commits into from
Dec 18, 2020

Conversation

wolfs
Copy link
Member

@wolfs wolfs commented Dec 11, 2020

No description provided.

@wolfs wolfs self-assigned this Dec 11, 2020
@wolfs wolfs added the internal Internal change label Dec 11, 2020
@@ -21,6 +21,17 @@ fun ParametrizedWithType.java8Home(os: Os) {
param("env.JAVA_HOME", "%${os.name}.java8.oracle.64bit%")
}
Copy link
Member

Choose a reason for hiding this comment

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

Do we still need java8Home()? If so, I think it call through to javaHome().

Copy link
Member Author

Choose a reason for hiding this comment

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

I removed java8Home.

@@ -7,6 +7,7 @@ fun Project.configureGradleProfilerProject() {
buildType(MacOSJava18)
buildType(WindowsJava18)
buildType(LinuxJava18)
buildType(LinuxJava11)
Copy link
Member

Choose a reason for hiding this comment

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

I think this would be a good opportunity to rename Java18 to Java8.

Copy link
Member Author

Choose a reason for hiding this comment

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

I can do this post-merge, so I still run the tests on my branch. Renaming the object causes a change in the ID in Teamcity, so I can't do this change on a branch.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done: 53c13e4

@@ -8,18 +10,40 @@ abstract class AbstractProfilerIntegrationTest extends AbstractIntegrationTest {

private static int NUMBER_OF_HEADERS = 4

static List<String> supportedOnCurrentJvm(List<String> gradleVersions) {
Copy link
Member

Choose a reason for hiding this comment

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

How about calling this gradleVersionsSupportedOnCurrentJvm()?

Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed.

@@ -1349,7 +1354,7 @@ buildGoal {
def scenarios = file("performance.scenario")
scenarios.text = """
buildTarget {
versions = ["4.5"]
versions = ["5.2"]
Copy link
Member

Choose a reason for hiding this comment

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

Why the upgrade here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because 4.5 doesn't work with Java 11.

@wolfs
Copy link
Member Author

wolfs commented Dec 18, 2020

@lptr PTAL!

Copy link
Member

@lptr lptr left a comment

Choose a reason for hiding this comment

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

LGTM.

@wolfs wolfs marked this pull request as ready for review December 18, 2020 10:06
@wolfs wolfs merged commit 280074a into master Dec 18, 2020
@wolfs wolfs deleted the wolfs/test-on-java11 branch December 18, 2020 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
internal Internal change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants