Skip to content

Commit e6b5e68

Browse files
Limit heap size for Gradle daemons forked by the smoke tests (#10089)
1 parent 3504cef commit e6b5e68

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ abstract class CiVisibilitySmokeTest extends Specification {
7575
}
7676

7777
protected List<String> buildJvmArguments(String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
78-
List<String> arguments = []
78+
List<String> arguments = ["-Xms256m", "-Xmx256m"]
7979

8080
arguments += preventJulPrefsFileLock()
8181

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
2727

2828
private static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000 // Gradle's default timeout is 10s
2929

30-
// TODO: Gradle daemons started by the TestKit have an idle period of 3 minutes
31-
// so by the time tests finish, at least some of the daemons are still alive.
32-
// Because of that the temporary TestKit folder cannot be fully deleted
3330
@Shared
3431
@TempDir
3532
Path testKitFolder

dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
220220

221221
String javaToolOptions(Map<String, String> additionalAgentArgs) {
222222
additionalAgentArgs.put(CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED, "false")
223-
return buildJvmArguments(mockBackend.intakeUrl, TEST_SERVICE_NAME, additionalAgentArgs).join("\\ ")
223+
return buildJvmArguments(mockBackend.intakeUrl, TEST_SERVICE_NAME, additionalAgentArgs).join(" ")
224224
}
225225

226226
private static class StreamConsumer extends Thread {

0 commit comments

Comments
 (0)