Skip to content

Commit ab3468e

Browse files
committed
Tests are working locally on OS X
1 parent b9c5af5 commit ab3468e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,12 @@ abstract class AbstractSmokeTest extends ProcessManager {
132132

133133
def javaProperties() {
134134
def tmpDir = "/tmp"
135-
def errorFileValue = tmpDir + "/hs_err_pid%p.log"
136-
135+
137136
def ret = [
138137
"${getMaxMemoryArgumentForFork()}",
139138
"${getMinMemoryArgumentForFork()}",
140139
"-javaagent:${shadowJarPath}",
141-
isIBM ? "-Xdump:directory=" + tmpDir : "-XX:ErrorFile=" + errorFileValue,
140+
isIBM ? "-Xdump:directory=${tmpDir}" : "-XX:ErrorFile=${tmpDir}/hs_err_pid%p.log",
142141
"-Ddd.trace.agent.port=${server.address.port}",
143142
"-Ddd.env=${ENV}",
144143
"-Ddd.version=${VERSION}",
@@ -153,19 +152,20 @@ abstract class AbstractSmokeTest extends ProcessManager {
153152
"-Ddd.site="
154153
]
155154

155+
if (inferServiceName()) {
156+
ret += "-Ddd.service.name=${SERVICE_NAME}"
157+
}
156158

157159
// DQH - 13 Nov 2024 - Crashtracking bash script doesn't work on OS X,
158160
// so skipping crash tracking on OS X
159161
if (!Platform.isMac() && !Platform.isJ9()) {
160-
def errorScript = tmpDir + "/dd_crash_uploader." + getScriptExtension()
161-
def onErrorValue = errorScript + ' %p'
162+
def extension = getScriptExtension()
162163

163-
ret += "-XX:OnError=" + onErrorValue
164+
ret += "-XX:OnError=${tmpDir}/dd_crash_uploader.${extension} %p"
165+
// Unlike crash tracking smoke test, keep the default delay; otherwise, otherwise other tests will fail
166+
// ret += "-Ddd.dogstatsd.start-delay=0"
164167
}
165168

166-
if (inferServiceName()) {
167-
ret += "-Ddd.service.name=${SERVICE_NAME}"
168-
}
169169
ret as String[]
170170
}
171171

0 commit comments

Comments
 (0)