GRADLE-2485 ensure jvmargs sustain debug options when new args are added

gradle · Oct 31, 2012 · dc70c26 · dc70c26
1 parent 25d678d
commit dc70c26
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/subprojects/core/src/main/groovy/org/gradle/process/internal/JvmOptions.java b/subprojects/core/src/main/groovy/org/gradle/process/internal/JvmOptions.java
@@ -197,8 +197,6 @@ public void jvmArgs(Iterable<?> arguments) {
         if (xdebugFound && xrunjdwpFound) {
             debug = true;
             extraJvmArgs.removeAll(matches);
-        } else {
-            debug = false;
         }
     }
 

diff --git a/subprojects/core/src/test/groovy/org/gradle/process/internal/JvmOptionsTest.groovy b/subprojects/core/src/test/groovy/org/gradle/process/internal/JvmOptionsTest.groovy
@@ -144,6 +144,32 @@ class JvmOptionsTest extends Specification {
         1 * target.systemProperties({it == ["file.encoding": "UTF-16"]})
     }
 
+    def "can enter debug mode"() {
+        def opts = createOpts()
+        when:
+        opts.debug = true
+        then:
+        opts.debug
+    }
+
+    def "can enter debug mode after setting other options"() {
+        def opts = createOpts()
+        when:
+        opts.jvmArgs(JvmOptions.fromString('-Xmx1G -Xms1G'))
+        opts.debug = true
+        then:
+        opts.allJvmArgs.containsAll(['-Xmx1G', '-Xms1G', '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'])
+    }
+
+    def "can enter debug mode before setting other options"() {
+        def opts = createOpts()
+        opts.debug = true
+        when:
+        opts.jvmArgs(JvmOptions.fromString('-Xmx1G -Xms1G'))
+        then:
+        opts.allJvmArgs.containsAll(['-Xmx1G', '-Xms1G', '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'])
+    }
+
     private JvmOptions createOpts() {
         return new JvmOptions(new IdentityFileResolver())
     }