aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-03Add prb to junit OWNERS.Pete Bentley
Test: n/a Change-Id: I8ae0ade50e82fec4b53451e46b8ffa29ba4f3e20
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799cPete Bentley
* changes: Don't convert assumption failures into errors in ErrorCollector.addError(). Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Extra generic type information to aid certain javacs. Upgrade external/junit to 4.13.2
2021-03-02Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
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
2021-03-02Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. This change re-lands https://r.android.com/1601635 Bug: 129054170 Test: m checkbuild Change-Id: I4b37c2d09b5c68afde438c343b41fcdc788c578e (cherry picked from commit 4156f43b51c6f2d42df6e45535e1967aa46514d3)
2021-03-02Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. This change re-lands https://r.android.com/1601634 Bug: 129054170 Test: m Change-Id: Id1e2d63892e25026f68f9a345d788e2e7497e737 (cherry picked from commit c8055484aac0d002d00140b789711414f4130428)
2021-03-02Extra generic type information to aid certain javacs.Pete Bentley
In particular this is needed for the code to compile using the error prone analyzer. This change re-lands https://r.android.com/1601633 Bug: 129054170 Test: m Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc (cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
2021-03-02Upgrade external/junit to 4.13.2Pete Bentley
Contains just the changes from 4.12 to 4.13.2 and undoes local Android changes. Will re-patch those in in subsequent CLs. This change re-lands https://r.android.com/1598413. Bug: 129054170 Test: m Change-Id: I6135799c8be5db2ec4c3f13951c18c072427e30d
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 am: 91c5e5ff9d am: 138b64feb6 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic05d8452bb92220507ec751aa85c8e657f77cc79
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 am: 91c5e5ff9d am: 138b64feb6 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4659c35b4eeb246138a19c92854bacfc614e8ba5
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 am: 91c5e5ff9d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa51f5a85f96ec87a01eff9bc98e2274fc5a97dd
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: ↵David Srbecky
23e304a839 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I443f57dd29ed2557b7733b1f3e51718d5d6a2af4
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281David Srbecky
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b6b1c8147b46e6c2a0ebd81a22edbb370082ded
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP"David Srbecky
* changes: Revert "Upgrade external/junit to 4.13.2" Revert "Extra generic type information to aid certain javacs." Revert "Remove DisableOnDebug (new in 4.12) as it is not support..." Revert "Remove support for stuck threads"
2021-02-24Revert "Upgrade external/junit to 4.13.2"David Srbecky
Revert submission 1601635 Reason for revert: b/181123058 Reverted Changes: I8f5cd1266:Remove support for stuck threads Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s... I6abae5aed:Extra generic type information to aid certain java... I5ec909df6:Upgrade external/junit to 4.13.2 Change-Id: Idaddfc2039816a8d7b12c91fdd540b801ab854ff
2021-02-24Revert "Extra generic type information to aid certain javacs."David Srbecky
Revert submission 1601635 Reason for revert: b/181123058 Reverted Changes: I8f5cd1266:Remove support for stuck threads Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s... I6abae5aed:Extra generic type information to aid certain java... I5ec909df6:Upgrade external/junit to 4.13.2 Change-Id: Ic641a09a2f6e661e2f466941123e74aba0ac4dac
2021-02-24Revert "Remove DisableOnDebug (new in 4.12) as it is not support..."David Srbecky
Revert submission 1601635 Reason for revert: b/181123058 Reverted Changes: I8f5cd1266:Remove support for stuck threads Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s... I6abae5aed:Extra generic type information to aid certain java... I5ec909df6:Upgrade external/junit to 4.13.2 Change-Id: I464bf4512b5e19f37ba69ac42a5e9c22f61bc7d1
2021-02-24Revert "Remove support for stuck threads"David Srbecky
Revert submission 1601635 Reason for revert: b/181123058 Reverted Changes: I8f5cd1266:Remove support for stuck threads Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s... I6abae5aed:Extra generic type information to aid certain java... I5ec909df6:Upgrade external/junit to 4.13.2 Change-Id: Icf0a7b88b0004e60cd4139cb10be62af5bdc68d2
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 am: 82af4b8b1d am: 99022df227 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9d6917a074028da6e240c6974f79d484e028da3
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 am: 82af4b8b1d am: 99022df227 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9275ec780c450c13ced4b2c46030fe4ecd5a7f32
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 am: 82af4b8b1d Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib180e48a4cc266c12a2d9238385adbb07540d3dc
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib00d0e3bda09315496b61b51b207bd8981c947e7
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357Pete Bentley
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I05d47d7655c50db318c4060118dfcd98af542a45
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909dfPete Bentley
* changes: Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Extra generic type information to aid certain javacs. Upgrade external/junit to 4.13.2
2021-02-23Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m checkbuild Change-Id: I8f5cd12661c1559a3d144858a5a8a742e5adba9e (cherry picked from commit 4156f43b51c6f2d42df6e45535e1967aa46514d3)
2021-02-23Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m Change-Id: Ifdb59336df4a4695d1f873755daa02d6042775c6 (cherry picked from commit c8055484aac0d002d00140b789711414f4130428)
2021-02-23Extra generic type information to aid certain javacs.Pete Bentley
In particular this is needed for the code to compile using the error prone analyzer. Bug: 129054170 Test: m Change-Id: I6abae5aedc567d3c6a991046551b62a08a8b3337 (cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
2021-02-22Upgrade external/junit to 4.13.2Pete Bentley
Contains just the changes from 4.12 to 4.13.2 and undoes local Android changes. Will re-patch those in in subsequent CLs. Bug: 129054170 Test: m Change-Id: I5ec909df6840f6c54cbab9c509c5addaee3f94e6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s ↵Xin Li
ours am: d5e3037560 -s ours am: 468041bf45 -s ours am skip reason: Change-Id Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 with SHA-1 f86beaa2f1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1e2c3db4e1efa10ab394ebd78eb72203fa1e5f4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s ↵Xin Li
ours am: d5e3037560 -s ours am: 468041bf45 -s ours am skip reason: Change-Id Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 with SHA-1 f86beaa2f1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10a13585cf7f345fd894671eadde837922fe9402
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s ↵Xin Li
ours am: d5e3037560 -s ours am skip reason: Change-Id Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 with SHA-1 f86beaa2f1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I502acc2de7016ade5abab091c818da4d022e48ed
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s oursXin Li
am skip reason: Change-Id Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 with SHA-1 f86beaa2f1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d0304edc612fe3f6f62ad946956993680c504cb
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 Change-Id: I4bd32fba1677f6b150c3930772c3546272868d74
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: ↵Bob Badour
730701d221 am: 92937ff285 am: ac5bf4d034 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d4c7622fe245174395cbdbb1b1131d9a9ef86da
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: ↵Bob Badour
730701d221 am: 92937ff285 am: ac5bf4d034 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie29834a1c723efaeaabc7630f5ced0c3b2bd858f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: ↵Bob Badour
730701d221 am: 92937ff285 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3841180f2bbf7fc941326870577e0811ffdddf8f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: ↵Bob Badour
730701d221 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7125f6183726bfdc789395963a18bdaa0023d47
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10c766fe80ee5cf519454496c0b73622d4a50c81
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/junitBob Badour
Added SPDX-license-identifier-EPL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9cd43f586feb5cd5906cd6b649dd5f020836136c
2020-11-24Mark ab/6881855 as merged am: 9393ddd7a0 am: f86beaa2f1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13110683 Change-Id: I4e5f8059c0b530cffbf52bc0fa70e9705c5cd182
2020-11-24Mark ab/6881855 as merged am: 9393ddd7a0Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13110683 Change-Id: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie071e74b49de9ad7e24916f217a48fd00d4bd280
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: ↵Xin Li
8535401e0e -s ours am: 46e4cee555 -s ours am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: Ibe51b36e3751f3f25e6eb32a065e566cbc083d79
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: ↵Xin Li
8535401e0e -s ours am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: I7f1c86de3c610b71ed726d5611b8d361cfd5be8a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s oursXin Li
am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: Ia7bc88b0936ff6943321c2df117cb3e586d86622
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d Change-Id: Icd25eae932b0da95ff4d92328e4c457945decbc9
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am: 2f99d67b10 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Ibb136302d97e9b246b7a72ccb0eda4ba89beee30
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: I755d2217483642cace074a0a03cf588912a6ba3e
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Iba304cdd5c175d26a49245f3a7282079cfa3abbd
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Id57267bde02299dae7d802551237f3382bc2bf26
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 21:18:15 +0000