aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-05Merge "Merge "stack_protector_DeathTest#modify_stack_protector: avoid ↵android12L-tests-devAutomerger Merge Worker
flake." into android12-tests-dev am: 793d1fb5ab" into android12L-tests-dev
2022-10-05Merge "stack_protector_DeathTest#modify_stack_protector: avoid flake." into ↵Shubhangi Pawar
android12-tests-dev am: 793d1fb5ab Original change: https://android-review.googlesource.com/c/platform/bionic/+/2240186 Change-Id: I3b367d57efa507d95bba1dfcc630237995c7adda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "stack_protector_DeathTest#modify_stack_protector: avoid flake." into ↵android12-tests-devShubhangi Pawar
android12-tests-dev
2022-10-04stack_protector_DeathTest#modify_stack_protector: avoid flake.Elliott Hughes
I've never been able to repro the flake myself (in hundreds of thousands of runs), but it's certainly possible that a byte of the cookie is already zero. So let's invert the byte we plan to corrupt rather than set it to zero. Bug: http://b/202948861 Test: treehugger Change-Id: Iccd552fe302d6c01e376819d23c11a308e03acdb (cherry picked from commit 23ce50c1728c6bc6986e12073d5d3c8ab10d05d0)
2022-05-18Merge "Merge "Merge "Merge "mntent_test: don't assume /proc isn't the first ↵Automerger Merge Worker
mount." into android10-tests-dev am: 0462cfb766" into android11-tests-dev am: 0a5cc21c42" into android12-tests-dev am: 46871c040d" into android12L-tests-dev
2022-05-18Merge "Merge "Merge "mntent_test: don't assume /proc isn't the first mount." ↵Automerger Merge Worker
into android10-tests-dev am: 0462cfb766" into android11-tests-dev am: 0a5cc21c42" into android12-tests-dev am: 46871c040d Original change: https://android-review.googlesource.com/c/platform/bionic/+/2098734 Change-Id: I10ed03dd6f920e19dc8c62c89217bf583dd21d96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Merge "Merge "mntent_test: don't assume /proc isn't the first mount." ↵Automerger Merge Worker
into android10-tests-dev am: 0462cfb766" into android11-tests-dev am: 0a5cc21c42" into android12-tests-dev
2022-05-18Merge "Merge "mntent_test: don't assume /proc isn't the first mount." into ↵Automerger Merge Worker
android10-tests-dev am: 0462cfb766" into android11-tests-dev am: 0a5cc21c42 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2098734 Change-Id: Ic585470d3f383c9dcbc6e989b46ec8d6ce17eefd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Merge "mntent_test: don't assume /proc isn't the first mount." into ↵android11-tests-devAutomerger Merge Worker
android10-tests-dev am: 0462cfb766" into android11-tests-dev
2022-05-18Merge "mntent_test: don't assume /proc isn't the first mount." into ↵Shubhangi Pawar
android10-tests-dev am: 0462cfb766 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2098734 Change-Id: I92a208d548197b48fc35082b5e219895bf16a904 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "mntent_test: don't assume /proc isn't the first mount." into ↵android10-tests-devShubhangi Pawar
android10-tests-dev
2022-05-16mntent_test: don't assume /proc isn't the first mount.Elliott Hughes
This test tried to be lazy and test both getmntent() and getmntent_r() in the same test, but that led to an implicit assumption that /proc isn't the first mount returned. This new version is quite a bit more thorough than the old. It does assume that the mount list doesn't change while the test is running, but that seems like a reasonable assumption to make during CTS? Bug: https://issuetracker.google.com/230228681 Test: treehugger Change-Id: I5c5f0b86ae1c4df9a2ce69d48e1c3accb42c687b (cherry picked from commit 1e393b0699745d6120d2fd43f58dc3d5863e3b87)
2022-04-27Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android12-tests-dev am: b4cee37d7d" into android12L-tests-dev
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev ↵Treehugger Robot
am: b4cee37d7d Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078360 Change-Id: Ia864567dea05116f0b92edd31f5645edbc82e483 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-devTreehugger Robot
2022-04-27Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev
2022-04-27Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359 Change-Id: I162c86e60a34a50eef6079bcab78172c69c76f00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android11-tests-dev am: 9d0912a7b2" into android12-tests-dev
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev ↵Treehugger Robot
am: 9d0912a7b2 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359 Change-Id: I0888d94e6b6f19b25bfb5b5482ba18e539ceed60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." ↵Automerger Merge Worker
into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev
2022-04-27Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358 Change-Id: Ia3d387780844a30feaaa65c55841f0577561620d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into ↵Automerger Merge Worker
android12-tests-dev am: d8fa0f64af" into android12L-tests-dev
2022-04-27Merge "Regression test for scudo crash in resizeTaggedChunk." into ↵Treehugger Robot
android12-tests-dev am: d8fa0f64af Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121 Change-Id: I49830085e20d8aa627b9322672aaaa4770ac5515 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Skip the malloc_slack test on native bridge." into ↵Automerger Merge Worker
android12-tests-dev am: 1623704319" into android12L-tests-dev
2022-04-27Merge "Skip the malloc_slack test on native bridge." into ↵Treehugger Robot
android12-tests-dev am: 1623704319 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022 Change-Id: Id50dd0d3a8060ad7943a9f08401e88b05c75be4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker
android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev
2022-04-27Merge "Merge "Merge "Fix possible issue with cfi_basic test." into ↵Automerger Merge Worker
android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415 Change-Id: I8bbdff9b63ebf8e0ee708c6c56fdf020c9f96c13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into android12-tests-dev am: 0f42ca9a3d [automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours
2022-04-27Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into ↵Automerger Merge Worker
android12-tests-dev am: 0f42ca9a3d Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: I962fc4b81e6ad9036be2aed88e6bc5cc58e69cad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27[automerger skipped] Merge "Remove stack address check in cfi_basic test." ↵Treehugger Robot
into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours am skip reason: skipped by user eugenis Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143 Change-Id: I936a873352937664f09b12a6f00c46de893fccf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into android12-tests-dev am: 80effeeac9 [automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours
2022-04-27Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into ↵Automerger Merge Worker
android12-tests-dev am: 80effeeac9 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: Iff415cc90425d8727609998829f782fbc143a0bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27[automerger skipped] Merge "Fix linker path for emulated architecture" into ↵Treehugger Robot
android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am skip reason: skipped by user levarum Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110 Change-Id: I4b1309e041e0ec2399d8c61777c04183b1e998f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into android12-tests-dev am: e30b026c00 [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours
2022-04-27Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into ↵Automerger Merge Worker
android12-tests-dev am: e30b026c00 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: I78e626ce0389a9b719f1432a035e0f05359ace5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit ↵Treehugger Robot
binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am skip reason: skipped by user rossyeh Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119 Change-Id: Iefbfb2034a76c1857fa205cc7d53230cacba75aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Merge "Merge "Stop executing if skip occurs." into ↵Automerger Merge Worker
android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev
2022-04-27Merge "Merge "Merge "Stop executing if skip occurs." into ↵Automerger Merge Worker
android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826 Change-Id: Ie9e151f8485c6fe17422edf3177bacf2c994f26e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into ↵Automerger Merge Worker
android12-tests-dev am: d8a59345e1" into android12L-tests-dev
2022-04-27Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into ↵Automerger Merge Worker
android12-tests-dev am: d8a59345e1 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1466626 Change-Id: I924a1f432dd6aa2efc86740c25c079451f14389e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge changes from topic "am-eea3e96d84c34ba68e8c9263fc0b0332" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge "[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours" into android12-tests-dev am: f414cb356b [automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours
2022-04-27Merge "[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into ↵Automerger Merge Worker
android11-tests-dev am: 0d97015dbe -s ours" into android12-tests-dev am: f414cb356b Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308 Change-Id: Ib4e18d83f42fbff9fc6f6ae119615ba8ad4065de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into ↵Treehugger Robot
android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours am skip reason: skipped by user levarum Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308 Change-Id: I4c11e36bd5e77bc7e2f9dffb8aec8fb300888ebb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-devTreehugger Robot
2022-04-27Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev
2022-04-27Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358 Change-Id: I716eacb116e3a4a29acd1aa10ad96f43c583b56b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into ↵Automerger Merge Worker
android10-tests-dev am: 16457fd9d0" into android11-tests-dev
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev ↵Treehugger Robot
am: 16457fd9d0 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358 Change-Id: I70cff5fe0a62321c8d71d1e88f616a21b4879cf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-devTreehugger Robot
2022-04-27Fix unistd.exec_argv0_null for new kernels.Elliott Hughes
There are other options here (see the code comment for details), but this is the least effort/least disruptive for now. Bug: 228898932, 227498625 Test: treehugger Change-Id: I33be6fbfc022238de2f1846a69af1e712a9d6391 (cherry picked from commit bb1cc5a82c8e19d5f4231988ba48ce3de43ff3ed)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 09:46:26 +0000