Commit graph

77628 commits

Author SHA1 Message Date
Automerger Merge Worker
db8555c78e [automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

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

Change-Id: I0429bf782d2461d0c3e581b4d6b0f6335b639edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:55:11 +00:00
Edward Liaw
5f7df5fc4a [automerger skipped] Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556 am: 7a7bacd019 -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

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

Change-Id: I73173860a89228d2933ea37c75d99ac2f9c72731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:55:06 +00:00
Automerger Merge Worker
421a3c69ad Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev 2024-01-25 19:11:31 +00:00
Edward Liaw
7a7bacd019 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I4b8b44df9fc3a78fde2fe2eaa5f74063fc11efcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:11:14 +00:00
Edward Liaw
966dbfec30 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android13-tests-dev 2024-01-25 18:45:48 +00:00
Edward Liaw
ce34e32556 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev 2024-01-25 18:45:38 +00:00
Edward Liaw
78eca9b78c sched_policy_test: set_sched_policy also set the cpuset policy as fallback
get_sched_policy uses the cpuset policy as fallback if the cpu cgroup
is not recognized.  Pixel is currently not using the cpu cgroup for
background policy due to b/208895940.

Bug: 265852986
Bug: 287704782
Test: atest libcutils_test:libcutils_test.SchedPolicy#set_sched_policy -- --abi arm64-v8a
Signed-off-by: Edward Liaw <edliaw@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d5ffbdfc56a7c2510a3f1bdca9fd714f30a19434)
Merged-In: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
Change-Id: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
2024-01-24 00:10:34 +00:00
Edward Liaw
7e5925ef02 sched_policy_test: set_sched_policy also set the cpuset policy as fallback
get_sched_policy uses the cpuset policy as fallback if the cpu cgroup
is not recognized.  Pixel is currently not using the cpu cgroup for
background policy due to b/208895940.

Bug: 265852986
Bug: 287704782
Test: atest libcutils_test:libcutils_test.SchedPolicy#set_sched_policy -- --abi arm64-v8a
Signed-off-by: Edward Liaw <edliaw@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d5ffbdfc56a7c2510a3f1bdca9fd714f30a19434)
Merged-In: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
Change-Id: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
2024-01-24 00:10:23 +00:00
Automerger Merge Worker
2520bfb0d9 Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev 2023-06-07 22:18:20 +00:00
Automerger Merge Worker
b30ffaea19 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: Ia1640c6f62b2c3260620a775a439e5dbd715c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 22:18:18 +00:00
Automerger Merge Worker
50cac03f37 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev 2023-06-07 21:59:14 +00:00
Treehugger Robot
0b3153f9c0 Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I80baf972eba778b21195028782a2cf63fc7b85f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:59:11 +00:00
Treehugger Robot
9825551dbf Merge "libcutils_test: static libjsoncpp" into android12-tests-dev 2023-06-07 21:25:59 +00:00
Steven Moreland
447b4a4bf0 libcutils_test: static libjsoncpp
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
2023-06-06 17:54:52 +00:00
Automerger Merge Worker
0412ff9c1e Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev 2023-06-03 00:21:00 +00:00
Treehugger Robot
4fc18600ac Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: Ie667cac11be2ee5eef1cc7b434777689757c0a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:20:57 +00:00
Automerger Merge Worker
d42cd6887d Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev
* changes:
  [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours
  [automerger skipped] libsnapshot: Remove flaky image creation test. am: 1136e2fc30 -s ours
2023-06-03 00:19:30 +00:00
Treehugger Robot
fcfa292007 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Ibe542f5442106dd809afd7f679210ea67c6094ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:19:26 +00:00
David Anderson
ad0b3413a7 [automerger skipped] libsnapshot: Remove flaky image creation test. am: 1136e2fc30 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I60f0a27e7df8a4a119fd7e28b74e22dbf67fbddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:19:25 +00:00
Treehugger Robot
11caad9d6c Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev 2023-06-02 23:51:12 +00:00
Treehugger Robot
cf62ede082 Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev 2023-06-02 23:51:10 +00:00
David Anderson
1136e2fc30 libsnapshot: Remove flaky image creation test.
This test has always been flaky, and is not testing something super
valuable: we know that image creation succeeds throughout the rest of
the suite, so it's not very interesting to know that it can succeed in a
low-space scenario.

The inverse test is much more valuable, since we want the correct status
code when creation fails due to low space.

Bug: 240391002
Test: vts_libsnapshot_test
Merged-In: I6235d11033d2f30efe530077b877863ba2574810
Change-Id: I6235d11033d2f30efe530077b877863ba2574810
(cherry picked from commit 97e8a2f0e9)
2023-06-01 15:49:51 +00:00
David Anderson
c786b6d332 libsnapshot: Use SnapshotManager to delete devices.
Diagnosing DM_DEV_REMOVE failures in the test harness is quite
difficult, and it's not clear if failures are spurious or not. Instead
use SnapshotManager's helper function, which can retry on failure, and
will self-diagnose issues on legitimate failures.

Bug: N/A
Test: vts_libsnapshot_test
Change-Id: Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685
Merged-In: Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685
(cherry picked from commit e02ef9e9ce)
2023-06-01 14:20:03 +00:00
David Anderson
1264f39449 Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev 2023-05-17 18:22:26 +00:00
David Anderson
3f96053b38 DO NOT MERGE: libsnapshot: Fix test failures on certain configurations.
Due to how CF is built and tested, VABC is enabled even when not
supported by the kernel. To work around this add some logic in
libsnapshot and the test harness to recognize this situation and
silently flip off the VABC flag.

This also fixes the -force_mode option to vts_libsnapshot_test, so that
it will skip tests that aren't supported by the device.

Bug: 264279496
Test: vts_libsnapshot_test on android13-gsi with 11-5.4 kernel
Change-Id: I9279d8d400cac5cd504a7ae91f254aae57fa856d
2023-05-03 19:07:50 +00:00
Automerger Merge Worker
5658f34653 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev 2023-04-26 17:05:37 +00:00
Automerger Merge Worker
51349daf08 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours
am skip reason: skipped by user dvander

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

Change-Id: I1fdf41caf785e5149dbdea83a0e74f18db63886a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:04:31 +00:00
Automerger Merge Worker
5141eaf353 Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev 2023-04-26 02:45:46 +00:00
Treehugger Robot
2316bf2eaf Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Iefd00dd6629a0850cffb7a4a170d8c831a7c2007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:45:43 +00:00
Treehugger Robot
b880578664 Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev 2023-04-26 02:13:15 +00:00
David Anderson
6727d5840b libsnapshot: Fix test failures on certain configurations.
Due to how CF is built and tested, VABC is enabled even when not
supported by the kernel. To work around this add some logic in
libsnapshot and the test harness to recognize this situation and
silently flip off the VABC flag.

This also fixes the -force_mode option to vts_libsnapshot_test, so that
it will skip tests that aren't supported by the device.

Bug: 264279496
Test: vts_libsnapshot_test on android12-gsi with 11-5.4 kernel
Change-Id: I9279d8d400cac5cd504a7ae91f254aae57fa856d
2023-04-25 23:50:48 +00:00
David Anderson
cb6ea9edb4 Merge "libsnapshot: Disable 32-bit VTS tests on 64-bit systems." into android13-tests-dev 2023-02-09 20:10:05 +00:00
David Anderson
33e044574a libsnapshot: Disable 32-bit VTS tests on 64-bit systems.
These tests don't work because 32-bit dependencies are not normally
packaged on a 64-bit system.

Bug: 263062262
Test: builds
Change-Id: I68859a9e9c029a528ee12c02569a3693261c7251
(cherry picked from commit 32fa3e96f4)
2023-02-08 18:59:43 +00:00
Treehugger Robot
9be0c7bbbc Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." into android13-tests-dev 2022-09-21 00:07:44 +00:00
biandonglei
bfd3e38284 Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first.
test:
 run vts -m vts_ota_config_test -t VAB#Enabled

issue:
 245441425

Change-Id: I1795c931b28fd5fe28aa0f23717d4238fb352d37
2022-09-17 06:44:46 +00:00
David Anderson
220d4aba05 Merge "libsnapshot: Remove flaky image creation test." into android13-tests-dev 2022-08-29 23:50:26 +00:00
David Anderson
5b9c9ba1e0 libsnapshot: Remove flaky image creation test.
This test has always been flaky, and is not testing something super
valuable: we know that image creation succeeds throughout the rest of
the suite, so it's not very interesting to know that it can succeed in a
low-space scenario.

The inverse test is much more valuable, since we want the correct status
code when creation fails due to low space.

Bug: 240391002
Test: vts_libsnapshot_test
Change-Id: I6235d11033d2f30efe530077b877863ba2574810
(cherry picked from commit 97e8a2f0e9)
2022-08-18 20:09:11 +00:00
David Anderson
aee8ddbc46 vts_fs_test: Only require EROFS in T+ kernels.
Bug: 237765186
Test: vts_fs_test
Ignore-AOSP-First: cherry-pick
Change-Id: I294535953bfbe0f246347487b746d3adf2fca1aa
Merged-In: I294535953bfbe0f246347487b746d3adf2fca1aa
2022-07-14 17:47:51 +00:00
David Anderson
3282850933 Revert "Do not enforce EROFS for android-T and below."
This reverts commit a571d4a9bc.

Reason for revert: Incorrect fix

Bug: 237765186
Ignore-AOSP-First: cherry-pick
Change-Id: I6586c8e53cc89418d1802807a1a2e108f7e825d3
Merged-In: I6586c8e53cc89418d1802807a1a2e108f7e825d3
2022-07-14 17:47:47 +00:00
P.Adarsh Reddy
b2182ee8e0 Do not enforce EROFS for android-T and below.
EROFS is not mandatory for android T and below,
so skip the test for those.

Bug: 237765186
Test: vts_fs_test fs#ErofsSupported
Change-Id: Iceea46f8f2d443636de504962b718a2461605591
Ignore-AOSP-First: already present in aosp/master
2022-07-12 17:58:24 +00:00
Benergy Meenan Ravuri
9591090a17 Check userspace snapshots only for API level >= T
Skip checking for userspace snapshots enabled property
for API level < T as this feature is not applicable for
GRF targets.

Bug: 236450435
Test: vts_ota_config_test
Change-Id: Ib5083f6237cdf4962aae06f166811d67cf6c385e
Ignore-AOSP-First: already present in aosp/master
2022-07-12 17:57:59 +00:00
Akilesh Kailash
299717115e libsnapshot: Fix vts_libsnapshot_test.SnapshotUpdateTest#FullUpdateFlow
Check if compression feature is enabled.

Bug: 238143011
Test: OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I77663799a5371f1de8b4e29d7c777a24249d1b7b
Ignore-AOSP-First: already present in aosp/master
2022-07-12 17:57:25 +00:00
Ray Ye
621c74c063 Updating async trace for track trace symbols from T/U to G/H
Bug: 230399626
Test: atest TraceDevTest
Ignore-AOSP-First: Change from aosp/2078467 without ABI change
Change-Id: Ia927c19f544536f78c20ccef5830bd1be0cebf9b
Merged-In: Ia1b39f55c96011a9672f4d5c8763044f849d0bb2
2022-06-22 19:09:06 +00:00
Akilesh Kailash
ae04e7ede1 libsnapshot: Fix vts_libsnapshot_test for GRF with Vendor on S
If the vendor partition is on S and system partition is on T,
certain tests in vts_libsnapshot_test used to fail. This is primarily
because of inconsistent check between daemon and vts test.

vts test checks the userspace.snapshots.enabled property which is true on T
but never checks if the underlying vendor partition is on S. Hence,
vts test will enable userspace snapshots. However, daemon checks
the vendor partition and disables userspace snapshots thereby
leading to inconsistency.

This is only a problem on vts tests. The underlying OTA on devices
works fine as we have the vendor partition check.

Bug: 236311008
Test: vts_libsnapshot_test on S vendor and T system
      vts_libsnapshot_test on T vendor and T system
Ignore-AOSP-First: cherry-pick from aosp
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Iad4f299bd2e07c9c01f5fbee6a20e2f01bf1778a
2022-06-16 22:56:14 +00:00
Shawn Willden
18cf62712c Implement GetRootOfTrust
Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Change-Id: I8485360f253ca20f008c5df5090e79c1781fbb4f
Merged-In: I8485360f253ca20f008c5df5090e79c1781fbb4f
Ignore-AOSP-First: already present in aosp/master
2022-06-14 10:22:43 +01:00
Akilesh Kailash
ae2837d80c Merge "init: Set oom_score_adj to snapuserd process" into tm-dev 2022-06-02 23:18:52 +00:00
Akilesh Kailash
1a2f870cb3 init: Set oom_score_adj to snapuserd process
When a process is started as a native service,
oom_score_adj is set to -1000 so that processes
are unkillable by lmkd.

During boot, snapuserd process is not started as a service;
hence, we need to set the oom_score_adj explicitly else in
the event of low memory situation, lmkd can kill the
process thereby device can never boot.

Bug: 234691483
Test: th and OTA on Pixel
Ignore-AOSP-First: cherry-pick from AOSP
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ic2c85aa470522b4bc847a16b4f5cebfc528ed3cf
2022-06-02 21:19:46 +00:00
Stephen Crane
71100bbc44 [trusty] Bump number of ACVP arguments to match boringssl
Cherry-pick note: Needed for the BoringSSL change in the same topic.  No functional change to Android devices, this change affects ACVP testing only.

Boringssl added a new argument to the ACVP modulewrapper, so we need to
sync this change to the Trusty modulewrapper.

Test: m trusty_acvp_modulewrapper
Bug: 233873228
Change-Id: Ia79705d9fe32a07afc09cf8e0231db300073b504
(cherry picked from commit 08d8557718)
Merged-In: Ia79705d9fe32a07afc09cf8e0231db300073b504
2022-05-31 19:04:19 +00:00
TreeHugger Robot
190e2bc6e1 Merge "storaged: Avoid divide-by-zero in performance measurement" into tm-dev 2022-05-31 16:47:14 +00:00
David Anderson
5b227f3451 vts_fs_test: Require EROFS sysfs nodes.
These were backported to android13-5.10 and should be present in
T-launch kernels.

Bug: 233926292
Test: vts_fs_test
Change-Id: Ifb5ff6a200b081fe8696d5803d4a128740eb8e21
Merged-In: Ifb5ff6a200b081fe8696d5803d4a128740eb8e21
Ignore-AOSP-First: cherry-pick
2022-05-27 19:01:59 +00:00