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

chore: pass "same hashcode" to test task only #2822

Merged
merged 1 commit into from
Feb 19, 2023
Merged

chore: pass "same hashcode" to test task only #2822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,14 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
_JAVA_OPTIONS: ${{ matrix.testExtraJvmArgs }}
_JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
with:
read-only: ${{ matrix.os == 'self-hosted' }}
job-id: jdk${{ matrix.java_version }}
arguments: --scan --no-parallel --no-daemon jandex test ${{ matrix.extraGradleArgs }}
properties: |
includeTestTags=${{ matrix.includeTestTags }}
testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}

- name: 'Install krb5 for GSS tests'
if: ${{ matrix.gss == 'yes' }}
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/matrix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,10 @@ include.forEach(v => {
v.extraGradleArgs = gradleArgs.join(' ');
});
include.forEach(v => {
// Arguments passed to all the JVMs via _JAVA_OPTIONS
let jvmArgs = [];
// Extra JVM arguments passed to test execution
let testJvmArgs = [];
v.replication = v.replication.value;
v.slow_tests = v.slow_tests.value;
v.xa = v.xa.value;
Expand Down Expand Up @@ -278,7 +281,10 @@ include.forEach(v => {
v.deploy_to_maven_local = true
}
if (v.hash.value === 'same') {
jvmArgs.push('-XX:+UnlockExperimentalVMOptions', '-XX:hashCode=2');
// "same hashcode" causes issue for javac, and kotlinc,
// so we pass it to test execution only
// See https://github.com/pgjdbc/pgjdbc/pull/2821#issuecomment-1436013284
testJvmArgs.push('-XX:+UnlockExperimentalVMOptions', '-XX:hashCode=2');
}
// Gradle does not work in tr_TR locale, so pass locale to test only: https://github.com/gradle/gradle/issues/17361
jvmArgs.push(`-Duser.country=${v.locale.country}`);
Expand Down Expand Up @@ -307,7 +313,8 @@ include.forEach(v => {
jvmArgs.push('-XX:+StressCCP');
}
}
v.testExtraJvmArgs = jvmArgs.join(' ');
v.extraJvmArgs = jvmArgs.join(' ');
v.testExtraJvmArgs = testJvmArgs.join(' ::: ');
delete v.hash;
});

Expand Down
4 changes: 4 additions & 0 deletions build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.github.vlsi.gradle.dsl.configureEach
import com.github.vlsi.gradle.properties.dsl.props
import org.gradle.api.tasks.testing.Test

plugins {
Expand All @@ -20,6 +21,9 @@ tasks.configureEach<Test> {
exclude("**/*Suite*")
jvmArgs("-Xmx1536m")
jvmArgs("-Djdk.net.URLClassPath.disableClassPathURLCheck=true")
props.string("testExtraJvmArgs").trim().takeIf { it.isNotBlank() }?.let {
jvmArgs(it.split(" ::: "))
}
// Pass the property to tests
fun passProperty(name: String, default: String? = null) {
val value = System.getProperty(name) ?: default
Expand Down