diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-04-30 07:15:29 -0700 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-04-30 14:34:04 +0000 |
| commit | a3091f6f588fa7df00a42acb7a04ebd2c336edca (patch) | |
| tree | 8f25255dd0450f37aca86a113dc909db6da1c3eb | |
| parent | ae8715d14cddf518e7a2a4acf59c5ec7ec0ad67b (diff) | |
| download | idea-a3091f6f588fa7df00a42acb7a04ebd2c336edca.tar.gz | |
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)
| -rw-r--r-- | build/scripts/common_tests.gant | 6 | ||||
| -rw-r--r-- | build/scripts/utils.gant | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant index 6528d3c8c3cb..f13c342dd23b 100644 --- a/build/scripts/common_tests.gant +++ b/build/scripts/common_tests.gant @@ -61,11 +61,7 @@ target('run_tests': 'Run java tests') { }; } - 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 81be1b7daf54..f2b0c1a921fa 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -235,9 +235,10 @@ binding.setVariable("commonJvmArgs", { "-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 @@ binding.setVariable("reassignAltClickToMultipleCarets", {String communityHome -> "<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 +}) |