[benchmarks][authfs] Run AuthFsBenchmarks in postsubmit
Test: atest AuthFsHostTest AuthFsBenchmarks
Bug: 254050475
Change-Id: I2ff801532c73a8b7dcde89c0d87bdf339c447ab4
diff --git a/authfs/TEST_MAPPING b/authfs/TEST_MAPPING
index 3c84b76..ab6111b 100644
--- a/authfs/TEST_MAPPING
+++ b/authfs/TEST_MAPPING
@@ -6,5 +6,10 @@
{
"name": "AuthFsHostTest"
}
+ ],
+ "avf-postsubmit": [
+ {
+ "name": "AuthFsBenchmarks"
+ }
]
}
diff --git a/authfs/tests/Android.bp b/authfs/tests/Android.bp
deleted file mode 100644
index 0177254..0000000
--- a/authfs/tests/Android.bp
+++ /dev/null
@@ -1,55 +0,0 @@
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-java_test_host {
- name: "AuthFsHostTest",
- srcs: ["java/**/*.java"],
- libs: [
- "tradefed",
- "compatibility-tradefed",
- "compatibility-host-util",
- ],
- static_libs: [
- "MicrodroidHostTestHelper",
- ],
- test_suites: ["general-tests"],
- data_device_bins_first: [
- "open_then_run",
- "fsverity",
- ],
- per_testcase_directory: true,
- data: [
- ":authfs_test_files",
- ":CtsApkVerityTestPrebuiltFiles",
- ":MicrodroidTestApp",
- ":measure_io",
- ],
-}
-
-rust_test {
- name: "open_then_run",
- crate_name: "open_then_run",
- srcs: ["open_then_run.rs"],
- edition: "2021",
- rustlibs: [
- "libandroid_logger",
- "libanyhow",
- "libclap",
- "libcommand_fds",
- "liblibc",
- "liblog_rust",
- ],
- test_suites: ["general-tests"],
- test_harness: false,
-}
-
-cc_binary {
- name: "measure_io",
- srcs: [
- "measure_io.cpp",
- ],
- shared_libs: [
- "libbase",
- ],
-}
diff --git a/authfs/tests/benchmarks/Android.bp b/authfs/tests/benchmarks/Android.bp
new file mode 100644
index 0000000..b198328
--- /dev/null
+++ b/authfs/tests/benchmarks/Android.bp
@@ -0,0 +1,37 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+ name: "AuthFsBenchmarks",
+ srcs: ["src/java/com/android/fs/benchmarks/*.java"],
+ libs: [
+ "tradefed",
+ ],
+ static_libs: [
+ "AuthFsHostTestCommon",
+ "MicrodroidHostTestHelper",
+ ],
+ test_suites: ["general-tests"],
+ data_device_bins_first: [
+ "open_then_run",
+ "fsverity",
+ ],
+ per_testcase_directory: true,
+ data: [
+ ":authfs_test_files",
+ ":CtsApkVerityTestPrebuiltFiles",
+ ":MicrodroidTestApp",
+ ":measure_io",
+ ],
+}
+
+cc_binary {
+ name: "measure_io",
+ srcs: [
+ "src/measure_io.cpp",
+ ],
+ shared_libs: [
+ "libbase",
+ ],
+}
diff --git a/authfs/tests/benchmarks/AndroidTest.xml b/authfs/tests/benchmarks/AndroidTest.xml
new file mode 100644
index 0000000..7ca3a80
--- /dev/null
+++ b/authfs/tests/benchmarks/AndroidTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration description="Config for authfs tests">
+ <!-- Need root to start virtualizationservice -->
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
+
+ <!-- Still need to define SELinux policy for authfs and fd_server properly. -->
+ <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer"/>
+
+ <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+ <option name="throw-if-cmd-fail" value="true" />
+ <!-- Prepare test directories. -->
+ <option name="run-command" value="mkdir -p /data/local/tmp/authfs/mnt" />
+ <option name="teardown-command" value="rm -rf /data/local/tmp/authfs" />
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+ <option name="cleanup" value="true" />
+ <option name="abort-on-push-failure" value="true" />
+
+ <!-- Test executable -->
+ <option name="push-file" key="open_then_run" value="/data/local/tmp/open_then_run" />
+ <option name="push-file" key="fsverity" value="/data/local/tmp/fsverity" />
+
+ <!-- Test data files -->
+ <option name="push-file" key="cert.der" value="/data/local/tmp/authfs/cert.der" />
+ <option name="push-file" key="input.4m" value="/data/local/tmp/authfs/input.4m" />
+ <option name="push-file" key="input.4m.fsv_meta"
+ value="/data/local/tmp/authfs/input.4m.fsv_meta" />
+
+ <!-- Just pick a file with signature that can be trused on the device. -->
+ <option name="push-file" key="CtsApkVerityTestAppPrebuilt.apk"
+ value="/data/local/tmp/authfs/input.apk" />
+ <option name="push-file" key="CtsApkVerityTestAppPrebuilt.apk.fsv_sig"
+ value="/data/local/tmp/authfs/input.apk.fsv_sig" />
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+ <option name="throw-if-cmd-fail" value="true" />
+ <!-- Now that the files are pushed to the device, enable fs-verity for the targeting file.
+ It works because the signature is trusted on all CTS compatible devices. -->
+ <option name="run-command"
+ value="cd /data/local/tmp/authfs;
+ ../fsverity enable input.apk --signature=input.apk.fsv_sig" />
+ </target_preparer>
+
+ <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+ <option name="jar" value="AuthFsBenchmarks.jar" />
+ </test>
+</configuration>
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java b/authfs/tests/benchmarks/src/java/com/android/fs/benchmarks/AuthFsBenchmarks.java
similarity index 98%
rename from authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java
rename to authfs/tests/benchmarks/src/java/com/android/fs/benchmarks/AuthFsBenchmarks.java
index af2c892..5e9073a 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java
+++ b/authfs/tests/benchmarks/src/java/com/android/fs/benchmarks/AuthFsBenchmarks.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.virt.fs;
+package com.android.virt.fs.benchmarks;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestMetrics;
@@ -22,6 +22,7 @@
import android.platform.test.annotations.RootPermissionTest;
+import com.android.fs.common.AuthFsTestRule;
import com.android.microdroid.test.common.MetricsProcessor;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.invoker.TestInformation;
diff --git a/authfs/tests/measure_io.cpp b/authfs/tests/benchmarks/src/measure_io.cpp
similarity index 100%
rename from authfs/tests/measure_io.cpp
rename to authfs/tests/benchmarks/src/measure_io.cpp
diff --git a/authfs/tests/common/Android.bp b/authfs/tests/common/Android.bp
new file mode 100644
index 0000000..ec426c7
--- /dev/null
+++ b/authfs/tests/common/Android.bp
@@ -0,0 +1,33 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library_host {
+ name: "AuthFsHostTestCommon",
+ srcs: ["src/java/**/*.java"],
+ libs: [
+ "compatibility-host-util",
+ "compatibility-tradefed",
+ "tradefed",
+ ],
+ static_libs: [
+ "MicrodroidHostTestHelper",
+ ],
+}
+
+rust_test {
+ name: "open_then_run",
+ crate_name: "open_then_run",
+ srcs: ["src/open_then_run.rs"],
+ edition: "2021",
+ rustlibs: [
+ "libandroid_logger",
+ "libanyhow",
+ "libclap",
+ "libcommand_fds",
+ "liblibc",
+ "liblog_rust",
+ ],
+ test_suites: ["general-tests"],
+ test_harness: false,
+}
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java b/authfs/tests/common/src/java/com/android/fs/common/AuthFsTestRule.java
similarity index 90%
rename from authfs/tests/java/src/com/android/fs/AuthFsTestRule.java
rename to authfs/tests/common/src/java/com/android/fs/common/AuthFsTestRule.java
index a9fdd10..994f23b 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java
+++ b/authfs/tests/common/src/java/com/android/fs/common/AuthFsTestRule.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.virt.fs;
+package com.android.fs.common;
import static com.android.microdroid.test.host.LogArchiver.archiveLogThenDelete;
import static com.android.tradefed.device.TestDevice.MicrodroidBuilder;
@@ -50,22 +50,22 @@
/** Custom TestRule for AuthFs tests. */
public class AuthFsTestRule extends TestLogData {
/** FUSE's magic from statfs(2) */
- static final String FUSE_SUPER_MAGIC_HEX = "65735546";
+ public static final String FUSE_SUPER_MAGIC_HEX = "65735546";
/** VM config entry path in the test APK */
private static final String VM_CONFIG_PATH_IN_APK = "assets/vm_config.json";
/** Test directory on Android where data are located */
- static final String TEST_DIR = "/data/local/tmp/authfs";
+ public static final String TEST_DIR = "/data/local/tmp/authfs";
/** File name of the test APK */
private static final String TEST_APK_NAME = "MicrodroidTestApp.apk";
/** Output directory where the test can generate output on Android */
- static final String TEST_OUTPUT_DIR = "/data/local/tmp/authfs/output_dir";
+ public static final String TEST_OUTPUT_DIR = "/data/local/tmp/authfs/output_dir";
/** Mount point of authfs on Microdroid during the test */
- static final String MOUNT_DIR = "/data/local/tmp/mnt";
+ public static final String MOUNT_DIR = "/data/local/tmp/mnt";
/** VM's log file */
private static final String LOG_PATH = TEST_OUTPUT_DIR + "/log.txt";
@@ -91,7 +91,7 @@
private final ExecutorService mThreadPool = Executors.newCachedThreadPool();
- static void setUpAndroid(TestInformation testInfo) throws Exception {
+ public static void setUpAndroid(TestInformation testInfo) throws Exception {
assertNotNull(testInfo.getDevice());
if (!(testInfo.getDevice() instanceof TestDevice)) {
CLog.w("Unexpected type of ITestDevice. Skipping.");
@@ -110,28 +110,28 @@
}
}
- static void tearDownAndroid() {
+ public static void tearDownAndroid() {
sAndroid = null;
}
/** This method is supposed to be called after {@link #setUpTest()}. */
- static CommandRunner getAndroid() {
+ public static CommandRunner getAndroid() {
assertThat(sAndroid).isNotNull();
return sAndroid;
}
/** This method is supposed to be called after {@link #setUpTest()}. */
- static CommandRunner getMicrodroid() {
+ public static CommandRunner getMicrodroid() {
assertThat(sMicrodroid).isNotNull();
return sMicrodroid;
}
- static ITestDevice getMicrodroidDevice() {
+ public static ITestDevice getMicrodroidDevice() {
assertThat(sMicrodroidDevice).isNotNull();
return sMicrodroidDevice;
}
- static void startMicrodroid() throws DeviceNotAvailableException {
+ public static void startMicrodroid() throws DeviceNotAvailableException {
CLog.i("Starting the shared VM");
assertThat(sMicrodroidDevice).isNull();
sMicrodroidDevice =
@@ -151,7 +151,7 @@
assertThat(sMicrodroidDevice.enableAdbRoot()).isTrue();
}
- static void shutdownMicrodroid() throws DeviceNotAvailableException {
+ public static void shutdownMicrodroid() throws DeviceNotAvailableException {
assertNotNull(sMicrodroidDevice);
getDevice().shutdownMicrodroid(sMicrodroidDevice);
sMicrodroidDevice = null;
@@ -172,7 +172,7 @@
description);
}
- void runFdServerOnAndroid(String helperFlags, String fdServerFlags)
+ public void runFdServerOnAndroid(String helperFlags, String fdServerFlags)
throws DeviceNotAvailableException {
String cmd =
"cd "
@@ -188,7 +188,7 @@
Future<?> unusedFuture = mThreadPool.submit(() -> runForResult(sAndroid, cmd, "fd_server"));
}
- void runAuthFsOnMicrodroid(String flags) {
+ public void runAuthFsOnMicrodroid(String flags) {
String cmd = AUTHFS_BIN + " " + MOUNT_DIR + " " + flags + " --cid " + VMADDR_CID_HOST;
AtomicBoolean starting = new AtomicBoolean(true);
@@ -215,7 +215,7 @@
}
}
- static File findTestFile(IBuildInfo buildInfo, String fileName) {
+ public static File findTestFile(IBuildInfo buildInfo, String fileName) {
try {
return (new CompatibilityBuildHelper(buildInfo)).getTestFile(fileName);
} catch (FileNotFoundException e) {
diff --git a/authfs/tests/open_then_run.rs b/authfs/tests/common/src/open_then_run.rs
similarity index 100%
rename from authfs/tests/open_then_run.rs
rename to authfs/tests/common/src/open_then_run.rs
diff --git a/authfs/tests/hosttests/Android.bp b/authfs/tests/hosttests/Android.bp
new file mode 100644
index 0000000..4b8151d
--- /dev/null
+++ b/authfs/tests/hosttests/Android.bp
@@ -0,0 +1,26 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+ name: "AuthFsHostTest",
+ srcs: ["java/src/com/android/fs/*.java"],
+ libs: [
+ "tradefed",
+ ],
+ static_libs: [
+ "MicrodroidHostTestHelper",
+ "AuthFsHostTestCommon",
+ ],
+ test_suites: ["general-tests"],
+ data_device_bins_first: [
+ "open_then_run",
+ "fsverity",
+ ],
+ per_testcase_directory: true,
+ data: [
+ ":authfs_test_files",
+ ":CtsApkVerityTestPrebuiltFiles",
+ ":MicrodroidTestApp",
+ ],
+}
diff --git a/authfs/tests/AndroidTest.xml b/authfs/tests/hosttests/AndroidTest.xml
similarity index 100%
rename from authfs/tests/AndroidTest.xml
rename to authfs/tests/hosttests/AndroidTest.xml
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java b/authfs/tests/hosttests/java/src/com/android/fs/AuthFsHostTest.java
similarity index 99%
rename from authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
rename to authfs/tests/hosttests/java/src/com/android/fs/AuthFsHostTest.java
index c4169f6..3157dfd 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
+++ b/authfs/tests/hosttests/java/src/com/android/fs/AuthFsHostTest.java
@@ -24,6 +24,7 @@
import android.platform.test.annotations.RootPermissionTest;
+import com.android.fs.common.AuthFsTestRule;
import com.android.microdroid.test.host.CommandRunner;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.invoker.TestInformation;