Commit graph

58934 commits

Author SHA1 Message Date
Treehugger Robot
bdf02cc54d Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev 2021-06-08 21:30:04 +00:00
David Anderson
560d098e0f resolve merge conflicts of 21ef3ae3fd to android11-tests-dev
Change-Id: I50ad8773a8e6182a48b8edb065bf1490616ebe0a
2021-06-02 23:36:48 +00:00
Treehugger Robot
21ef3ae3fd Merge "Skip test for Automotive in Android Q" into android10-tests-dev 2021-04-21 22:16:09 +00:00
huan qin
2c25e261fa Skip test for Automotive in Android Q
Two tests in VtsKernelLiblpTest
require dynamci partion which is not
mandatory for Automotive in Android Q:
VtsKernelLiblpTest#BuilderTest.block_device_info
VtsKernelLiblpTest#liblp.ReadSuperPartition

Test:run vts -m VtsKernelLiblpTest -t
VtsKernelLiblpTest#BuilderTest.block_device_info
Test:run vts -m VtsKernelLiblpTest -t
VtsKernelLiblpTest#liblp.ReadSuperPartition

Bug: 156287966
Change-Id: I353b854dd37f1ae3aeb7212c97e376dc9719ba91
2021-03-08 14:02:06 -05:00
Automerger Merge Worker
ff18b4305e Merge "[automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours" into android11-tests-dev 2021-01-05 21:58:26 +00:00
Treehugger Robot
191b82f0e9 [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50535fede4d32952b73b9f523a725a6c4927de18
2021-01-05 21:58:19 +00:00
Treehugger Robot
3d7e667b0a Merge "Adding Car GSI public key" into android10-tests-dev 2021-01-05 20:36:37 +00:00
Karthik Ramakrishnan
50dcaa3c0e Adding Car GSI public key
Bug: 140827657
Test: m qcar-gsi.avbpubkey
Change-Id: Ib493d17b9ca3859b8613de12fb8015d2ffb766f6
2020-12-23 15:43:39 -08:00
Automerger Merge Worker
48ca333cb6 Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev 2020-11-30 21:22:12 +00:00
Treehugger Robot
478bb8b8d3 Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I32fcc6b13e1fc58e387d45aadb8ee29a6895423f
2020-11-30 21:22:07 +00:00
Automerger Merge Worker
6d0ec70e01 Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev 2020-11-13 22:24:27 +00:00
Treehugger Robot
2fbea98119 [automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours
am skip reason: Change-Id I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 65e8e3803e is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: Ia6f38a3b2b5db0fe1fe129d0d47429f1d4aa2a8b
2020-11-13 22:24:24 +00:00
Automerger Merge Worker
9a2f9eccc7 Merge "[automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours" into android11-tests-dev 2020-11-13 22:24:19 +00:00
Treehugger Robot
606088f724 [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours
am skip reason: skipped by user dmulabagal

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I0e31b9b5e3de6c6295f49e8a6ed57e15425999f4
2020-11-13 22:24:14 +00:00
Automerger Merge Worker
b4ca02f997 Merge "[automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours" into android11-tests-dev 2020-11-12 22:57:58 +00:00
Treehugger Robot
350698a44c [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: Ieb8e450fe1ee7a6795d8b4dcbe395783627cbdb6
2020-11-12 22:57:54 +00:00
Automerger Merge Worker
7988343ad3 Merge "[automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours" into android11-tests-dev 2020-10-27 17:39:29 +00:00
Treehugger Robot
cc1a7a2abb [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours
am skip reason: skipped by user trong

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: I1b3cca5f93a26e35f0a2dccb2b184f6779e83d9e
2020-10-27 17:39:24 +00:00
Automerger Merge Worker
ad91c8b0b6 Merge "[automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours" into android11-tests-dev 2020-10-26 20:33:41 +00:00
Treehugger Robot
a26b9ad1bd [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: I6d81396e5838f89f8800245a0a2579a051abac75
2020-10-26 20:33:36 +00:00
Automerger Merge Worker
089db75bde Merge "[automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours" into android11-tests-dev 2020-10-22 20:17:32 +00:00
Treehugger Robot
2b889498a2 [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours
am skip reason: skipped by user robinjacob

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I3080a77a83204063f2859c7bdf2c6e3e86a48a8f
2020-10-22 20:17:28 +00:00
Treehugger Robot
0ceb0339aa Merge "logd: don't require chatty to pass CTS" into android11-tests-dev 2020-09-10 18:39:07 +00:00
Tom Cherry
b31cbd6bdd logd: don't require chatty to pass CTS
Remove a few tests that require logd to implement chatty to not
require chatty to pass CTS.  Note that these tests are already removed
in AOSP and won't be required in S.

Bug: 168100439
Test: these tests don't run
Merged-In: Ie12898617429a75b6caff92725aa7145650f8fc6
Change-Id: Ia81042a48e9675f2ad3ad75a10ec4d60c96ff712
2020-09-09 21:26:46 +00:00
sirius.wang
767fe1515a fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol.
The fastbootd over ethernet was implemented with IPv6 link-local
address. An IPv6 address may include many ':'. It will break this fuzzy
test. This new solution uses "tcp:" prefix to identify the fastboot
protocol, like the host fastboot command.

BUG: 157887327
Test: fuzzy_fastboot --serial=tcp:fe80::230:1bff:feba:8128%wlan0 \
      --gtest_filter=*Logical*
Bug: http://b/166279510

Change-Id: I8fe7e6e3ade94a26e05a31ac20ed9ab3839dd342
Merged-In: I971fd9e25741e18bf7f5907d562556b09db1d624
2020-08-25 17:33:17 +00:00
Treehugger Robot
da84e29fdf Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev 2020-08-12 19:25:50 +00:00
Yifan Hong
b085db746a libsnapshot_test: skip global setup on non-VAB devices.
On non-VAB devices, fake super image creation may fail because it
may not support f2fs file pinning.

Also changes global setup to a testing::Environment object because it is
the recommended way in gtest's guide. SnapshotTestEnvironement::TearDown
is automatically executed before RUN_ALL_TEST returns.

Test: vts_libsnapshot_test
Test: make IsVirtualAbEnabled() return false, then all tests are
skipped.

Bug: 162557082
Change-Id: I1382f9a4ddec146fa2d8cfb21ac66ca22a2e110f
(cherry picked from commit a7c00a0943)
Merged-In: I1382f9a4ddec146fa2d8cfb21ac66ca22a2e110f
2020-08-07 18:07:14 -07:00
Alessio Balsini
c723fca056 Re-enable libsnapshot ImageManagerTest
ImageManagerTest had been temporarily disabled because flaky.
This test looks stable now, re-enable it.

Bug: 148889015
Test: atest vts_libsnapshot_test [-- --abi x86]
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I858661fed7f58d1e2857ed88f5d8e0f5220bf8c2
(cherry picked from commit 42a608162d)
Merged-In: I858661fed7f58d1e2857ed88f5d8e0f5220bf8c2
2020-08-07 18:07:13 -07:00
Kazuhiro Inaba
9cecf8422a cts: Skip CtsInitTestCases over a native bridge.
The set of linked binaries was making it difficult to run
the test over a native bridge. Since init won't usually
run over a native bridge, the test can be skipped.

Bug: 161081809, 142324733, 162288553
Test: Arm build of CtsInitTestCases skips rammus-arc-r Chromebook.
Change-Id: Icdd8b03111d0f3fd6658ee6d9a97fca27181db45
2020-07-30 06:53:28 +00:00
sirius.wang
f595077e24 fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol.
The fastbootd over ethernet was implemented with IPv6 link-local
address. An IPv6 address may include many ':'. It will break this fuzzy
test. This new solution uses "tcp:" prefix to identify the fastboot
protocol, like the host fastboot command.

BUG: 157887327
Test: fuzzy_fastboot --serial=tcp:fe80::230:1bff:feba:8128%wlan0 \
      --gtest_filter=*Logical*

Change-Id: I8fe7e6e3ade94a26e05a31ac20ed9ab3839dd342
Merged-In: I971fd9e25741e18bf7f5907d562556b09db1d624
2020-07-20 17:27:26 +00:00
Xin Li
1521c58c5d Merge ab/12162526 into stage-aosp-rvc-ts-dev
Bug: 148878042
Change-Id: I54c668427c06c415584cc80d6e7d35d451b28393
2020-07-15 17:55:15 -07:00
Victor Khimenko
add3b3a137 Merge "Make libbacktrace buildable for native_bridge" into rvc-dev 2020-07-14 17:18:34 +00:00
Steven Moreland
8367a666b5 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b am: 26b81f59d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: Ib4704bc8a733ace56e7998b7bad5a6c5638900ad
2020-07-14 17:03:30 +00:00
Steven Moreland
26b81f59d2 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: Id47901d6e4247aafb9f666ba505ab966d3adefed
2020-07-14 16:45:16 +00:00
Steven Moreland
4e27b6992b String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I03057c052a24f205c78ee600178d45e0cd51a3c1
2020-07-14 16:29:09 +00:00
Steven Moreland
64fb5012b8 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I3ab9771d898eea0158acfd07fbe5a2f4b7dad883
2020-07-14 16:12:53 +00:00
Steven Moreland
9be245c3f0 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I22f6b8299b4b77be31859a10b14efe01b297d531
2020-07-14 15:51:29 +00:00
Steven Moreland
107f18cb61 String16::remove - avoid overflow am: 4048e49956
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I4dedf81e3471473e589a858e14d7a9ae5f91b3d9
2020-07-14 15:37:25 +00:00
Ray Essick
c8766043aa extend syscall minijail for clang code coverage
cutover to clang-based code coverage uses extra system call (ftruncate)
when writing coverage data. exposed while generating coverage for media.extractor.

Bug: 160917521
Test: build, boot, kill -37 extractors for {arm,x86}x{32,64}
Change-Id: I555b168c7aab43caa590df951861b92e8fa14bc3
2020-07-13 08:45:22 -07:00
Victor Khimenko
fb60e6c9ae Make libbacktrace buildable for native_bridge
Bug: http://b/153609531

Test: m -j64 libbacktrace.native_bridge

Change-Id: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
Merged-In: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
2020-07-10 20:13:23 +02:00
Tom Cherry
8272339d93 Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev 2020-07-09 22:53:44 +00:00
Tom Cherry
5c8457ef9a init: skip RejectsCriticalAndOneshotService for devices launched before R
This restriction is only added for devices launching with R or later.

Bug: 160663765
Test: this test runs when appropriate
Merged-In: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
Change-Id: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
(cherry picked from commit 0e40ba3183)
2020-07-09 14:36:12 -07:00
Yifan Hong
82e0c384f3 Merge changes I51628abe,I412d62b7 into rvc-dev
* changes:
  Wrap flock with TEMP_FAILURE_RETRY.
  Try locking after mounting metadata
2020-07-08 18:57:30 +00:00
Yifan Hong
bd6d2cded8 Wrap flock with TEMP_FAILURE_RETRY.
flock may return EINTR. There are code using LockShared() to test
existance of the directory. Don't fail spuriously.

Test: pass
Bug: 160457903
Change-Id: I51628abe05599422eb3f344781d8f3acd653c822
2020-07-08 18:57:24 +00:00
Yifan Hong
44033e75cc Try locking after mounting metadata
In rescue mode, if /metadata is mounted but /metadata/ota does
not exist, immediately unmount /metadata and fallback to the code
path when /metadata is not mounted; that is, old partitions are
overwritten.

Test: in recovery, select wipe then immediately sideload
Bug: 160457903
Change-Id: I412d62b7005c81a7126106edc471622e6a7ef813
2020-07-08 11:00:10 +00:00
TreeHugger Robot
46a58a5925 Merge "Remove SkipMountingPartitions from vendor libfstab" into rvc-dev 2020-07-07 02:01:59 +00:00
Yifan Hong
2ce3ddfee1 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev 2020-07-06 20:24:02 +00:00
Yifan Hong
ba5dfd76de liblp: Force 10.0 metadata on downgrade to Q.
Q liblp only supports 10.0 super partition metadata, so
forcefully downgrade the current metadata version too.

On retrofit Virtual A/B devices, the metadata version is
at most 10.1, because the new VIRTUAL_AB flag is not set
on retrofit devices.

In version 10.1, two per-partition flags: UPDATED and DISABLED
are introduced.
- The updated flag is set when the device undergoes a Virtual A/B
update before. Clear it.
- The disabled flag should only be set on metadata files used by
libfiemap ImageManager. It shouldn't be used on super partition metadata.

Hence, this CL should only clear UPDATED flag.

Test: R->R->Q OTA
Bug: 159590481
Change-Id: I8b548c8ce36a75197e7172a77f9207fd44fe4670
2020-07-06 10:06:36 -07:00
Hung-ying Tyan
0a0f4b163a Remove SkipMountingPartitions from vendor libfstab
SkipMountingPartitions() should only be called from a system process
as the config file is in /system_ext.
Remove it from the vendor variant of libfstab.

Bug: 158301941
Test: build hardware/interfaces/boot/1.1/default/boot_control and check symbol
Change-Id: I834183a623c0711dd79b89486fc3fc80f9710801
Merged-In: I834183a623c0711dd79b89486fc3fc80f9710801
(cherry picked from e7cb09d226)
2020-07-03 20:06:37 +08:00
Boleyn Su
9285b496bd ReadFileSymbolicLink checks /system/bin/ps
According to
https://android.googlesource.com/platform/build/+/refs/heads/android10-dev/core/Makefile#140,
/default.prop may not be a symbolic link.

Bug: 158552949
Test: atest CtsInitTestCases

Change-Id: I19bde577fa50280e1ed6fb8fdbe846655abb930b
Merged-In: I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9
(cherry picked from commit 6f47feaccdbe849c982e0de9068e38be85006bfb)
(cherry picked from commit 755a3dd78d)
2020-07-02 04:22:10 +00:00