aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-01Update jacoco's README.android.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devPete Gillin
The README was updated in http://ag/3492180 but not in http://ag/3505896. This change brings it up to date. (Only a minor change, but it seems better to be accurate.) Bug: 64836607 Test: N/A Change-Id: I32e161fec14eee35154f4d754ab2f14e160923c8
2018-01-24Further modify jacoco runtime to reduce deps on core libs.Pete Gillin
This changes it from eagerly creating an ExecutionDataStore to only eagerly creating a HashMap<Long, ExecutionData>, which was one of the two fields in ExecutionDataStore. This makes it possible to instrument 7 of the 10 previously blacklisted classes in java.util without creating a circular dependency at runtime. Bug: 64836607 Test: mvn clean install -Djdk.version=1.9 -Dbytecode.version=1.9 (in org.jacoco.build/) Test: `cts-tradefed run cts-dev -m CtsLibcoreTestCases --test-arg com.android.compatibility.testtype.LibcoreTest:coverage:true` on a build with EMMA_INSTRUMENT=true and EMMA_INSTRUMENT_FRAMEWORK=true Change-Id: I30dfeab8922b7d53f82fdab81020e4a7f0ef4e3e
2018-01-23Modify jacoco runtime to reduce dependencies on core libs.Pete Gillin
Previously, Offline's static initializer would eagerly create an Agent, a process which has lots of dependencies. With this change, Offline only eagerly creates an ExecutionDataStore, which is much more lightweight. The Agent is only created when it's actually needed. This makes it possible to instrument a lot of more core libraries without creating a circular dependency at runtime (e.g. all of java.io and java.nio, and most of java.util). Bug: 64836607 Test: mvn clean install -Djdk.version=1.9 -Dbytecode.version=1.9 (in org.jacoco.build/) Test: `cts-tradefed run cts-dev -m CtsLibcoreTestCases --test-arg com.android.compatibility.testtype.LibcoreTest:coverage:true` on a build with EMMA_INSTRUMENT=true and EMMA_INSTRUMENT_FRAMEWORK=true Change-Id: Ib1bd1adcd1ea58935a588f442dc57f958841c6aa
2018-01-19Fix a couple of jacoco unit tests.Pete Gillin
This updates the jacoco unit tests to reflect http://ag/904368 and http://aosp/275076. Test: mvn clean install -Djdk.version=1.9 -Dbytecode.version=1.9 (in org.jacoco.build/) Change-Id: I67824ac804f577edc0cedcba7619f25d90455d04
2018-01-08Merge tag 'v0.8.0' from 'aosp/upstream-master' into master. am: 8922af5540 ↵Allen Hair
am: d13806556c am: b5ff315117 Change-Id: I577ba5e2365d7320206f5007679d26f48d54f836
2018-01-08Merge tag 'v0.8.0' from 'aosp/upstream-master' into master. am: 8922af5540Allen Hair
am: d13806556c Change-Id: Ie277c808f9d8d335a718b746d5816b3d3c5bc57f
2018-01-08Merge tag 'v0.8.0' from 'aosp/upstream-master' into master.Allen Hair
am: 8922af5540 Change-Id: I889e76d47f936c4ab8795398e8a2769e64867860
2018-01-05Merge tag 'v0.8.0' from 'aosp/upstream-master' into master.android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Allen Hair
* 6a0c097f (tag: v0.8.0) Prepare release v0.8.0 * b9d1b54e Happy New Year 2018! * 6f375769 Consolidate change log for 0.8.0 release (#632) * 0c50b210 Restore exec files compatibility regarding Java 9 class files (#636) * 7f7c246f Offline instrumentation should not damage module-info (#634) * e050f194 Instrumentation should not damage structured locking (#627) * 4c0b93e8 Fix ExecutionData.merge JavaDoc (#630) * ff001947 Add filter for duplicates of finally blocks (#604) * 00f06ecc Fix typos Bug: 69463998 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I00f3079bdbb0618141b4414cac0b83dcf9c0c2d5
2018-01-03Update build files for new version of jacoco am: b760c4765c am: 850d514104Colin Cross
am: e997ed6016 Change-Id: Ifa0987895f4686f280b25590789d4e7058323488
2018-01-03Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
9ba7a6cafc am: 5f3f49a2c7 am: 2acb94f8dd Change-Id: I2ff0bffe4e33a9b08c37becc1c057f2dc825a8f7
2018-01-03Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" ↵Colin Cross
am: 37043f9e86 am: 8e7552aae7 am: 206294a6e5 Change-Id: Ie3bff7848f0eb705a1d776fe6f5c3680f332edb0
2018-01-03Update build files for new version of jacoco am: b760c4765cColin Cross
am: 850d514104 Change-Id: Ie1e87ee07b52b3fe35ac3e06c7cafa60a63e0f65
2018-01-03Merge remote-tracking branch 'aosp/upstream-master' into master am: 9ba7a6cafcColin Cross
am: 5f3f49a2c7 Change-Id: I7715f3a95ddcd39e35c73bf0d73f8a36645fbc34
2018-01-03Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" ↵Colin Cross
am: 37043f9e86 am: 8e7552aae7 Change-Id: I2fcdfd5240ed833c7910b2e4810a9d24b2aa8772
2018-01-03Update build files for new version of jacocoColin Cross
am: b760c4765c Change-Id: I2fce96ea6076a845fc37eabcec0b057b9dbfd95e
2018-01-03Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: 9ba7a6cafc Change-Id: I6fa68165ff9f6fb06bb7d92ced2aeb9564683caf
2018-01-03Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master"Colin Cross
am: 37043f9e86 Change-Id: Ic0b954b070d91e2e80a30eb515a5739d0e0311eb
2018-01-02Prepare release v0.8.0Evgeny Mandrikov
2018-01-01Happy New Year 2018!Evgeny Mandrikov
2018-01-01Consolidate change log for 0.8.0 release (#632)Marc R. Hoffmann
2018-01-01Restore exec files compatibility regarding Java 9 class files (#636)Evgeny Mandrikov
2017-12-28Offline instrumentation should not damage module-info (#634)Evgeny Mandrikov
2017-12-21Update build files for new version of jacocoColin Cross
Also remove asm-debug-all-5.0.1.jar in favor of the asm 6.0 prebuilts in prebuilts/misc/common/asm. Bug: 69669951 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: Idfda865afa9d3f40a388431aebee08455e4c8db8
2017-12-21Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
* e1502d10 Add build with JDK 10-ea * dd7809ac Cleanup AgentTest (#618) * 8f046096 Remove obsolete phase binding (#617) * cdd0ec17 Fix test that doesn't pass bytecode verification of Eclipse OpenJ9 JVM * 45223410 Use default environment in Travis instead of deprecated * caa820ed Upgrade ASM to 6.0 (#600) * ec6287a6 Add filter for methods annotated with @groovy.transform.Generated (#610) * 88d7b01d Fix test to not require additional settings on JDK 9 (#611) * bdfa45fe Add test of offline instrumentation of Java 9 module-info (#608) * 11ac0663 Document contract for In/OutputStream resources and fix example (#605) * 4d6ca957 Descriptive names for all tests in FrameSnapshotTest (#609) * 99244757 Add test of ASM bug 317792 (#607) * b060c251 Update links to ASM issues * e094d693 Add test of ASM bug 317793 (#606) * ac25a3f5 Apply naming convention and add missing tests * b19911c2 Suppress compiler warning * 1962cf59 Yak shaving: add ability to merge coverage of several instructions (#601) * aca2da1d Show in StringSwitchTest that filter works for complex expressions (#599) * 4109d66f Yak shaving: determine covered branches for each instruction (#598) * 04f923c1 Add filter for bytecode that javac generates for String in switch (#596) * 8cd32471 Happy birthday JDK 9! * 8a2822d1 Describe correct agent option in MBeanClient example (#582) * 4d08365f Add "--verbose" option to "classinfo" CLI command (#578) * 424251f1 Fix build in Travis * 90a1416c Fix build in Travis * 4b471ef7 Remove duplicate line from the file header * 4b7fd7cc Add link about integration of JaCoCo into Shippable (#579) * 5a745a38 Fix assertions for JDK 8 >= u152 (#576) * 765bf090 Remove unused SVN keyword "Id" * fcf9baf8 Remove unused MAVEN_OPTS * bb2ecb52 Add Artifact.SCOPE_PROVIDED artifacts to aggregate report (#572) * 86856fef Use proper exception type in documentation (#557) * 31575a30 For Java 9 add "Automatic-Module-Name" to manifests of JAR files (#565) * 98a2a41e Relocate 3rd party libs in CLI nodeps JAR (#561) * 63d375fd Fix build for JDK 9 >= b175 (#558) * c85fd2a4 Update documentation about Maven artifacts (#540) * 05a2aa7d Descriptor of jacoco-maven-plugin should include "help" mojo (#559) * c10af135 Reduce chance of conflict with other agents (#555) * 2a2f1619 Use dest argument as folder in any case (#543) * 817d0ae1 Merge pull request #541 from jacoco/issue-541 |\ | * 1b959434 Add location to IOException when unable to read stream during analysis |/ * 13f12d39 Add Command Line Interface (#525) * 10f3ff0d ExecDumpClient should report error when no data is retrieved (#538) * 938b0b4e Merge pull request #536 from mattnelson/percentages * 129201d6 Update documentation for limit configuration as percent. * c39e3d26 create reusable parseValue method for ratio limits * d9caed9d Support limit ratios as percents Bug: 69669951 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I484df66b7890b2b6d3d0d9401a60239a4a189260
2017-12-21Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master"Colin Cross
This reverts commit 369c1a464f4b750a0df7a750d5ab6bcc90202697, reversing changes made to ce2d33f3145d39d9e9aa6e8b59d409f803a13955. These changes are in upstream now, revert the manual merge to simplify merging upstream. Bug: 69669951 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I120abed4c5913abc948b81116225d3969c039549
2017-12-20Instrumentation should not damage structured locking (#627)Allen Hair
2017-12-20Fix ExecutionData.merge JavaDoc (#630)Joshua Blake
Correctly describe the behavior of the 'flag' parameter for the 'false' case.
2017-12-19Add filter for duplicates of finally blocks (#604)Evgeny Mandrikov
2017-12-13Copy jacoco-cli into dist for apps_onlyShankhoneer Chakrovarty
Test: make -j32 showcommands dist DIST_DIR=./out/ TARGET_BUILD_APPS='Launcher3 Launcher3Tests' EMMA_INSTRUMENT_STATIC=true TARGET_BUILD_VARIANT=userdebug Bug: 67056031 Change-Id: I0d0d47fa6d070f3a8901176d7296213cfc64bf88
2017-12-05Fix typosEvgeny Mandrikov
2017-11-15Add build with JDK 10-eaEvgeny Mandrikov
2017-11-12Cleanup AgentTest (#618)Marc R. Hoffmann
* Don't write to file system * Avoid DNS lookups (slows down builds) * Use new test naming conventions
2017-11-02Remove obsolete phase binding (#617)Marc R. Hoffmann
Since version 0.6.2 the "report" goal is bound to phase "verify".
2017-11-01Fix test that doesn't pass bytecode verification of Eclipse OpenJ9 JVMEvgeny Mandrikov
"JVMCFRE107 offset out of range in jump bytecode"
2017-10-21Use default environment in Travis instead of deprecatedEvgeny Mandrikov
* Ubuntu Trusty instead of Precise * Maven 3.5.0 (that uses Java 7) instead of Maven 3.2.5 (that was using Java 6) * OpenJDK 6 requires installation
2017-10-19Upgrade ASM to 6.0 (#600)Roberto Araujo
2017-10-17Add filter for methods annotated with @groovy.transform.Generated (#610)Michael Hoffmann
2017-10-13Fix test to not require additional settings on JDK 9 (#611)Evgeny Mandrikov
2017-10-10Add test of offline instrumentation of Java 9 module-info (#608)Evgeny Mandrikov
2017-10-10Document contract for In/OutputStream resources and fix example (#605)Marc R. Hoffmann
2017-10-09Fix coverage builds am: f4e43e6b7f am: 4bce1453ad am: 660d690b42Colin Cross
am: d617066fb6 Change-Id: I4c3a0f5cc7959b06dd7db8a2b25b4a74b1c9f76a
2017-10-09Fix coverage builds am: f4e43e6b7f am: 4bce1453adColin Cross
am: 660d690b42 Change-Id: Ic5b2cdef54410fe255744ac6f72866568fb17b75
2017-10-09Descriptive names for all tests in FrameSnapshotTest (#609)Marc R. Hoffmann
2017-10-09Fix coverage builds am: f4e43e6b7fColin Cross
am: 4bce1453ad Change-Id: I1193b66443f893e03b1154e7826cd4c2199e65ec
2017-10-09Fix coverage buildsandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
am: f4e43e6b7f Change-Id: Ida2aa2395e4bfcb0e685bd4db3124903e625927b
2017-10-09Fix coverage buildsColin Cross
jacocoagent is installed as its own library after I9e6e3dc59dba8b93685d59b258d4ebc7835eab8b, so it needs to be built non-static. Bug: 67578832 Test: m -j EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true Change-Id: Ib81bbe50e0010ed77725e885fded6af1dc8b221d
2017-10-09Add test of ASM bug 317792 (#607)Evgeny Mandrikov
2017-10-07Update links to ASM issuesEvgeny Mandrikov
2017-10-07Add test of ASM bug 317793 (#606)Evgeny Mandrikov
2017-10-07Convert jacoco to Android.bp am: 919bf5c9b5 am: adffb95cd0 am: 966432bdb5Colin Cross
am: 22a8daa639 Change-Id: I45c4c42fa635759bb833798fe566e7e101fb707d