Age | Commit message (Collapse) | Author |
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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)
|
|
Cherry-picking to mainline-prod for consistency with other branches.
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: I4b37c2d09b5c68afde438c343b41fcdc788c578e
Merged-In: I4b37c2d09b5c68afde438c343b41fcdc788c578e
(cherry picked from commit adac35f1ea1f9987d9843236991ad4120e704bcb)
|
|
Cherry-picking to mainline-prod for consistency with other branches.
It requires classes from the java.lang.management package which
is not supported on Android.
Bug: 129054170
Test: m
Change-Id: Id1e2d63892e25026f68f9a345d788e2e7497e737
Merged-In: Id1e2d63892e25026f68f9a345d788e2e7497e737
(cherry picked from commit 77cf67c410a013f5e33dc7b333a614f7e1b5ac66)
|
|
Cherry-picking to mainline-prod for consistency with other branches.
In particular this is needed for the code to compile using
the error prone analyzer.
Bug: 129054170
Test: m
Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc
Merged-In: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc
(cherry picked from commit 75dd2ceb505380a918bec2cb3d3096a6b362574c)
|
|
Cherry-picking to mainline-prod for consistency with other branches.
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: I6135799c8be5db2ec4c3f13951c18c072427e30d
Merged-In: I6135799c8be5db2ec4c3f13951c18c072427e30d
(cherry picked from commit 8e80a2a7b89329f95cb41e8b2981044362478c04)
|
|
e4c0069c95 am: d4fa0ece31
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib9d82d24ea1eb3ac9889307d8ac92b2d59d5200a
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4fa316f2ae4844ef588541940d76e835c8291cf
|
|
b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d am: a9a7715d84
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I56f45d05317bd1060b5838f1ada3a90bb2985d55
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c0cc83e4c0a64217ecf29cbfd11d74bcdbf4563
|
|
b6446bec0a am: fcd81b3e3f am: c7a6d4ec7d
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1a9bf8405e1b57da206312f5694e8c3ff5ce613
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1614801
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie451b647086796b29102ccef18fa2bfb32146ca6
|
|
|
|
b6446bec0a am: fcd81b3e3f
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide8f718358c2b88fb4af0b2b2792f5a560de4d67
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88041ad8242f07c65db7bbc3b8167363b604af63
|
|
Test: n/a
Change-Id: I8ae0ade50e82fec4b53451e46b8ffa29ba4f3e20
|
|
* 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
|
|
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
|
|
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)
|
|
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)
|
|
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)
|
|
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
|
|
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
|
|
23e304a839 am: 91c5e5ff9d
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa51f5a85f96ec87a01eff9bc98e2274fc5a97dd
|
|
23e304a839
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I443f57dd29ed2557b7733b1f3e51718d5d6a2af4
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b6b1c8147b46e6c2a0ebd81a22edbb370082ded
|
|
* 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"
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
d8911c6e95 am: 82af4b8b1d
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib180e48a4cc266c12a2d9238385adbb07540d3dc
|
|
d8911c6e95
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib00d0e3bda09315496b61b51b207bd8981c947e7
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05d47d7655c50db318c4060118dfcd98af542a45
|
|
* 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
|
|
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)
|
|
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)
|
|
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)
|
|
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
|
|
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
|