Don't enable debugging during build
In a previous CL, the -Xdebug option was disabled while running
tests in order to prevent the tests from failing to run if multiple
builds run simultaneously and accessed the same port. However it
was still being used during the initial build part. This CL removes
it globally during all builds.
Change-Id: I982d827f6d6b299f63045406b41b39e28e65dc0b
(cherry picked from commit 1804dd028a068c8020e230d23eefd7f7893f1793)
diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 6528d3c..f13c342 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -61,11 +61,7 @@
};
}
- commonJvmArgs().each {
- if (!it.startsWith("-Xdebug") && !it.startsWith("-Xrunjdwp")) { // don't run tests with debug enabled
- jvmarg(value: it)
- }
- }
+ commonJvmArgs().each { jvmarg(value: it) }
if (isDefined("jvm_args")) {
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 81be1b7..f2b0c1a 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -235,9 +235,10 @@
"-Xbootclasspath/p:${projectBuilder.moduleOutput(findModule("boot"))}",
"-XX:+HeapDumpOnOutOfMemoryError",
"-Didea.system.path=${p("teamcity.build.tempDir")}/system",
- "-Didea.config.path=${p("teamcity.build.tempDir")}/config",
- "-Xdebug",
- "-Xrunjdwp:transport=dt_socket,server=y,suspend=$suspendUntilDebuggerConnect,address=$debugPort"]
+ "-Didea.config.path=${p("teamcity.build.tempDir")}/config"]
+ // We don't want this on the Jenkins build server
+ // "-Xdebug",
+ // "-Xrunjdwp:transport=dt_socket,server=y,suspend=$suspendUntilDebuggerConnect,address=$debugPort"]
})
binding.setVariable("classPathLibs", [
@@ -911,4 +912,4 @@
"<mouse-shortcut keystroke=\"alt button1\"/>")
patchedKeymapFile = new File("${paths.sandbox}/classes/production/platform-resources/idea/Keymap_Default.xml")
patchedKeymapFile.write(defaultKeymapContent)
-})
\ No newline at end of file
+})