infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-19 04:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8332777: Update JCStress test suite

Browse Source 
Reviewed-by: lmesnik
This commit is contained in:
Evgeny Nikitin 2024-05-30 18:21:29 +00:00 committed by Leonid Mesnik
parent 44c1845ae7
commit 11e926cf50
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,14 +42,14 @@ import java.util.List;
* jcstress tests wrapper
*/
@Artifact(organization = "org.openjdk.jcstress", name = "jcstress-tests-all",
revision = "0.16", extension = "jar", unpack = false)
revision = JcstressRunner.VERSION, extension = "jar", unpack = false)
public class JcstressRunner {
public static final String VERSION = "0.17-SNAPSHOT-20240328";
public static final String MAIN_CLASS = "org.openjdk.jcstress.Main";
// Allow to configure jcstress mode parameter.
// Test mode preset: sanity, quick, default, tough, stress.
public static final String MODE_PROPERTY = "jcstress.mode";
public static final String TIME_BUDGET_PROPERTY = "jcstress.time_budget";
public static String timeBudget = "6m";
public static Path pathToArtifact() {
Map<String, Path> artifacts;
@ -59,7 +59,7 @@ public class JcstressRunner {
throw new Error("TESTBUG: Can not resolve artifacts for "
+ JcstressRunner.class.getName(), e);
}
return artifacts.get("org.openjdk.jcstress.jcstress-tests-all-0.16")
return artifacts.get("org.openjdk.jcstress.jcstress-tests-all-" + VERSION)
.toAbsolutePath();
}
@ -109,21 +109,17 @@ public class JcstressRunner {
extraFlags.add("--jvmArgs");
extraFlags.add("-Djava.io.tmpdir=" + System.getProperty("user.dir"));
// The "default" preset might take days for some tests
// so use quick testing by default.
String mode = "quick";
for (String jvmArg : Utils.getTestJavaOpts()) {
if(jvmArg.startsWith("-D" + MODE_PROPERTY)) {
String[] pair = jvmArg.split("=", 2);
mode = pair[1];
continue;
if (jvmArg.startsWith("-D" + TIME_BUDGET_PROPERTY)) {
timeBudget = jvmArg.split("=", 2)[1];
} else {
extraFlags.add("--jvmArgs");
extraFlags.add(jvmArg);
}
extraFlags.add("--jvmArgs");
extraFlags.add(jvmArg);
}
extraFlags.add("-m");
extraFlags.add(mode);
extraFlags.add("-tb");
extraFlags.add(timeBudget);
extraFlags.add("-sc");
extraFlags.add("false");