diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-23 08:21:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-23 08:21:32 +0000 |
| commit | f15e67fd15e1f1fdf1043eeee21333ecc79d188e (patch) | |
| tree | 6ea741d597fa8a2fb597c2ebadc941b06e67bd5b | |
| parent | ae2239678e27de4de142fb1b73dabd75cac93043 (diff) | |
| parent | 3fa3e608ee2aee9ac2087162bdaf03ec8bc46ea1 (diff) | |
| download | jacoco-f15e67fd15e1f1fdf1043eeee21333ecc79d188e.tar.gz | |
Snap for 4560043 from 3fa3e608ee2aee9ac2087162bdaf03ec8bc46ea1 to pi-release
Change-Id: I31ea90509f9e0034df920e0acdd2ff2ab99fe4c5
| -rw-r--r-- | org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java | 4 | ||||
| -rw-r--r-- | org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java index 45bc8bdc..9f9fc782 100644 --- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java +++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java @@ -37,6 +37,7 @@ import org.jacoco.core.runtime.AgentOptions.OutputMode; import org.jacoco.core.runtime.RuntimeData; import org.jacoco.core.tools.ExecFileLoader; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -132,6 +133,9 @@ public class AgentTest implements IExceptionLogger, IAgentOutput { } @Test + // BEGIN android-change + @Ignore + // END android-change public void startup_should_register_mbean_when_enabled() throws Exception { options.setJmx(true); Agent agent = createAgent(); diff --git a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java index f65142e9..155e3e88 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java @@ -47,7 +47,10 @@ public class AgentOptionsTest { assertFalse(options.getInclNoLocationClasses()); assertNull(options.getSessionId()); assertTrue(options.getDumpOnExit()); - assertEquals(AgentOptions.OutputMode.file, options.getOutput()); + // BEGIN android-change + // assertEquals(AgentOptions.OutputMode.file, options.getOutput()); + assertEquals(AgentOptions.OutputMode.none, options.getOutput()); + // END android-change assertEquals(AgentOptions.DEFAULT_ADDRESS, options.getAddress()); assertEquals(AgentOptions.DEFAULT_PORT, options.getPort()); assertNull(options.getClassDumpDir()); |