aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-21Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130b am: ↵HEADmastermainTreehugger Robot
9153ebaf70 am: 140c3e8c6d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2887826 Change-Id: Ia1e02c6ac71f7e2f05ff846a08dfe2510c2da547 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130b am: ↵Treehugger Robot
9153ebaf70 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2887826 Change-Id: I03bbd29fc5f235b21ac61ec3512a4e00908071c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2887826 Change-Id: I38af894f95e9610d444cd9f10c2c7d27401d324d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "Fix compile error on JDK 18 and later" into mainTreehugger Robot
2023-12-21Fix compile error on JDK 18 and laterSorin Basca
This is taken from https://github.com/junit-team/junit4/commit/0eb5ce72848d730da5bd6d42902fdd6a8a42055d There is no recent release of JUnit4 that would contain the fix. Bug: 313924276 Test: m EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true Change-Id: I51ac7b680559cfe1cb831a7a38f5daf469b4f242
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b ↵android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devSorin Basca
am: 9effceaaba Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901 Change-Id: I6f08c336ee23b8c3e5e44bc4c9771060e60d5e36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338bSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901 Change-Id: I8ac7185d34fddedd32070e18cc40eb5d1e2daa73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: f248774ff1android-u-beta-1-gplSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901 Change-Id: I46dfcfc9375e50e1afc829aa2acba433e63f0a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11"Sorin Basca
2023-02-04Pin tradefed dependencies to Java 11Sorin Basca
Bug: 267831518 Test: TH Change-Id: If51e0baa1c639b8566103c4e275c27cfc968cdd7
2022-11-24Merge "Correct the METADATA information." am: a00b917149 am: 5e10a923a0 am: ↵Treehugger Robot
f4ea7c0a3a Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2316062 Change-Id: I63e0b27c78e20b37947efccdb31e2676cba7d02b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24Merge "Correct the METADATA information." am: a00b917149 am: 5e10a923a0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2316062 Change-Id: Ib28c163419692fd84c79353aa3d4ef64e31e1469 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24Merge "Correct the METADATA information." am: a00b917149main-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2316062 Change-Id: I37dfc18577c4a543312bdc6fe1b87c92e75e76fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24Merge "Correct the METADATA information."Treehugger Robot
2022-11-24Correct the METADATA information.Krzysztof Kosiński
This was upgraded to 4.13.2 in March of last year, but the METADATA file was not updated to match. Bug: 129054170 Test: presubmit Change-Id: Id9f0a63a381e62dddbdde4790d1cc1581e3edfea
2021-11-24Merge "Disable errorprone's DoNotCall check in junit" am: 06d093120d am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Treehugger Robot
f8a5acaa27 am: 1883487014 am: 5fa2966197 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553 Change-Id: Idf8518218ace6959ab4c8a3a99af411b39dd83ed
2021-11-24Merge "Disable errorprone's DoNotCall check in junit" am: 06d093120d am: ↵Treehugger Robot
f8a5acaa27 am: 1883487014 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553 Change-Id: Ib68c8fbb323e6056fdd9f8f7071ab94689ea2564
2021-11-24Merge "Disable errorprone's DoNotCall check in junit" am: 06d093120d am: ↵Treehugger Robot
f8a5acaa27 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553 Change-Id: I62a55a9d769789469f2bcacd1ed481069eab0b0b
2021-11-24Merge "Disable errorprone's DoNotCall check in junit" am: 06d093120dandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1899553 Change-Id: If5149fcbc30c5fb5853d9a9393142e2d2738a38f
2021-11-24Merge "Disable errorprone's DoNotCall check in junit"Treehugger Robot
2021-11-23Disable errorprone's DoNotCall check in junitCole Faust
Junit call some methods that always throw an exception, and errorprone's DoNotCall checker enforces that these methods aren't called. Disable the DoNotCall checker for this module. Bug: 190944875 Test: Presubmits Change-Id: I3b97ae9e02b36b5f05b407691d67e260a67000e9
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am: 3b0fa394e8 -s ours am: 9b3a981a03 -s ours am: a92f311e22 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I7e27e26a6ce97068b402f2d9d6940537a55b5fbd
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am: 3b0fa394e8 -s ours am: 9b3a981a03 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I94fc8875a0cb8c3280acb57e3b73065f4aaa5242
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am: 3b0fa394e8 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I748b0994678e573a87bf51797683ad56356f4977
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: ↵Xin Li
addee62da9 -s ours am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I4a102a75a39a5ab5debe8db5e86f8faabab3482e
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s oursXin Li
am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1847514 Change-Id: I9247911d2967283dc8123b0e0901849a3655847f
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I50fd827167ac7459594e2b5e9ceb98607ee26fb3 Change-Id: I532df5c1340d53dc35ab6e512ec31458e173d5c4
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am: 415e8883f5 -s ours am: efe9bb63cf -s ours am: de440f6a5d -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: Idf7afac3d9d286442002453b9cceabb32fa8a023
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am: 415e8883f5 -s ours am: efe9bb63cf -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: Idbcafa5f0798ae40ed11593e11aea0c3328f51a7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am: 415e8883f5 -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: I0f231f0f03271fcb5595cc2b93f68d1cc983d4f0
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e015857610 -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: I64914a5a1222223133b4c0a93c424e74b617cc8f
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I9f46bd63b05b162864a19eef3588951fea8940d8 Change-Id: I50fd827167ac7459594e2b5e9ceb98607ee26fb3
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I85d176ea87d4de97025e1603e87a8c2a860ec3b8
2021-03-11[automerger skipped] Don't convert assumption failures into errors in ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releasePete Bentley
ErrorCollector.addError(). am: ccf3392c72 -s ours am: 7114aba399 -s ours am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3150b4e7e7e231db54d7e57f5859ad11f0304da
2021-03-11[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s ours ↵Paul Duffin
am: 527b249dca -s ours am skip reason: Change-Id I4b37c2d09b5c68afde438c343b41fcdc788c578e with SHA-1 adac35f1ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6db12131f7bb877e9ba190feaf24e016ce8077e4
2021-03-11[automerger skipped] Remove DisableOnDebug (new in 4.12) as it is not ↵Paul Duffin
supported on Android am: 878a3ac7a7 -s ours am: 87733b3f18 -s ours am skip reason: Change-Id Id1e2d63892e25026f68f9a345d788e2e7497e737 with SHA-1 77cf67c410 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799494 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5542b8e9ecc29bea7abb4cd5c93027e223891b6f
2021-03-11[automerger skipped] Extra generic type information to aid certain javacs. ↵Pete Bentley
am: 3f98e79978 -s ours am: 26a8efce71 -s ours am skip reason: Change-Id I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc with SHA-1 75dd2ceb50 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799493 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5cf9923b5d2ab7f98923bacde799479ea5fdc3f8
2021-03-11[automerger skipped] Upgrade external/junit to 4.13.2 am: 1f76da989f -s ours ↵Pete Bentley
am: f26431852e -s ours am skip reason: Change-Id I6135799c8be5db2ec4c3f13951c18c072427e30d with SHA-1 8e80a2a7b8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29caa2b3d862b19f6901fcdfd7de34cb78d2170f
2021-03-11[automerger skipped] Don't convert assumption failures into errors in ↵Pete Bentley
ErrorCollector.addError(). am: ccf3392c72 -s ours am: 7114aba399 -s ours am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib9937440eb367103cd20451980e751bc9ca54c54
2021-03-11[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s ours ↵Paul Duffin
am: 527b249dca -s ours am skip reason: Change-Id I4b37c2d09b5c68afde438c343b41fcdc788c578e with SHA-1 adac35f1ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c7153113e5c66904d04f9ef15df86d4b07328c6
2021-03-11[automerger skipped] Remove DisableOnDebug (new in 4.12) as it is not ↵Paul Duffin
supported on Android am: 878a3ac7a7 -s ours am: 87733b3f18 -s ours am skip reason: Change-Id Id1e2d63892e25026f68f9a345d788e2e7497e737 with SHA-1 77cf67c410 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799494 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0fdb03f5de8cc3f135690098b6d2269793e2275d
2021-03-11[automerger skipped] Extra generic type information to aid certain javacs. ↵Pete Bentley
am: 3f98e79978 -s ours am: 26a8efce71 -s ours am skip reason: Change-Id I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc with SHA-1 75dd2ceb50 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799493 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ef8d0e201d8f183aae3a7c42f68d54cb1a9b37a
2021-03-11[automerger skipped] Upgrade external/junit to 4.13.2 am: 1f76da989f -s ours ↵Pete Bentley
am: f26431852e -s ours am skip reason: Change-Id I6135799c8be5db2ec4c3f13951c18c072427e30d with SHA-1 8e80a2a7b8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic8558b8407861ef0ec843fed8ad70cddbdc352d9
2021-03-11[automerger skipped] Don't convert assumption failures into errors in ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releasePete Bentley
ErrorCollector.addError(). am: ccf3392c72 -s ours am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f46bd63b05b162864a19eef3588951fea8940d8
2021-03-11[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s oursPaul Duffin
am skip reason: Change-Id I4b37c2d09b5c68afde438c343b41fcdc788c578e with SHA-1 adac35f1ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c57c41a159d5b7554f80284e7815cece47a5a33
2021-03-11[automerger skipped] Remove DisableOnDebug (new in 4.12) as it is not ↵Paul Duffin
supported on Android am: 878a3ac7a7 -s ours am skip reason: Change-Id Id1e2d63892e25026f68f9a345d788e2e7497e737 with SHA-1 77cf67c410 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799494 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I825cf713ca908ac52d20128bcf55635a0ea893d5
2021-03-11[automerger skipped] Extra generic type information to aid certain javacs. ↵Pete Bentley
am: 3f98e79978 -s ours am skip reason: Change-Id I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc with SHA-1 75dd2ceb50 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799493 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieedaf1e03c1ccc50c14a8ff715fadffd1c5ae67a
2021-03-11[automerger skipped] Upgrade external/junit to 4.13.2 am: 1f76da989f -s oursPete Bentley
am skip reason: Change-Id I6135799c8be5db2ec4c3f13951c18c072427e30d with SHA-1 8e80a2a7b8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65279b7f289ac8d087537c6127d61f1001623cf9
2021-03-08Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
Cherry-picking to mainline-prod for consistency with other branches. It makes more sense to pass assumption failures through this path unchanged (unlike ErrorCollector.checkSucceeds) and converting them to errors breaks tests which use ErrorCollector in a wrapper Rule. Upstream issue: https://github.com/junit-team/junit4/issues/1703 Bug: 129054170 Test: m checkbuild Change-Id: I578a2676e52882c7d25d99061310ea38101883f6 Merged-In: I578a2676e52882c7d25d99061310ea38101883f6 (cherry picked from commit d3857e49835c77c9f8000af18904d05b43b24ce1)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:24:19 +0000