Merge "Remove VtsHalNeuralnetworksV1_3Benchmark python tests" into rvc-dev
diff --git a/testcases/host/kernel_net_test/Android.bp b/testcases/host/kernel_net_test/Android.bp
deleted file mode 100644
index af50e00..0000000
--- a/testcases/host/kernel_net_test/Android.bp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2020 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.
-
-java_test_host {
- name: "KernelNetTest",
- libs: [
- "compatibility-tradefed",
- "tradefed",
- "tradefed-common-util",
- ],
- srcs: ["src/**/*.java"],
- test_suites: [
- "general-tests",
- "vts",
- ],
- target_required: ["kernel_net_tests"],
-}
diff --git a/testcases/host/kernel_net_test/AndroidTest.xml b/testcases/host/kernel_net_test/AndroidTest.xml
deleted file mode 100644
index 9b15916..0000000
--- a/testcases/host/kernel_net_test/AndroidTest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2020 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="Runs vts_kernel_net_test.">
- <option name="test-suite-tag" value="apct" />
- <option name="test-suite-tag" value="apct-native" />
-
- <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="cleanup" value="true" />
- <option name="push-file" key="kernel_net_tests" value="/data/local/tmp/kernel_net_tests" />
- </target_preparer>
-
- <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
- <option name="airplane-mode" value="ON" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.HostTest" >
- <option name="jar" value="KernelNetTest.jar" />
- </test>
-
-</configuration>
diff --git a/testcases/host/kernel_net_test/src/com/android/tests/net/kernelnet/KernelNetTest.java b/testcases/host/kernel_net_test/src/com/android/tests/net/kernelnet/KernelNetTest.java
deleted file mode 100644
index f7bb59e..0000000
--- a/testcases/host/kernel_net_test/src/com/android/tests/net/kernelnet/KernelNetTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package android.tests.net.kernelnet;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-import com.android.tradefed.util.CommandResult;
-import com.android.tradefed.util.CommandStatus;
-import java.util.concurrent.TimeUnit;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/* Host test class to run android kernel unit test. */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class KernelNetTest extends BaseHostJUnit4Test {
- private String mTargetBinPath;
- private static final String DEVICE_BIN_ROOT = "/data/local/tmp/kernel_net_tests";
- /** The time in ms to wait for a command to complete. */
- private static final long CMD_TIMEOUT = 5 * 60 * 1000L;
- private static final String KERNEL_NET_TESTS = "kernel_net_tests";
-
- /**
- * Android kernel unit test.
- * @throws DeviceNotAvailableException
- */
- @Test
- public void testKernelNetworking() throws DeviceNotAvailableException {
- // The actual test binary file might be in sub-dictionary under DEVICE_BIN_ROOT.
- mTargetBinPath = findRunKernelNetPath(DEVICE_BIN_ROOT);
- CLog.d(String.format("mTargetBinPath: %s", mTargetBinPath));
- Assert.assertNotEquals(
- String.format("No kernel_net_tests binary found in %s", DEVICE_BIN_ROOT),
- mTargetBinPath, null);
-
- // Execute the test binary.
- CommandResult result = getDevice().executeShellV2Command(
- mTargetBinPath, CMD_TIMEOUT, TimeUnit.MILLISECONDS);
-
- Assert.assertTrue(
- String.format("kernel_net_tests binary returned non-zero exit code: %s, stdout: %s",
- result.getStderr(), result.getStdout()),
- CommandStatus.SUCCESS.equals(result.getStatus()));
- }
- /**
- * Find kernel_net_test file path under root folder.
- * Assume there is one kernel_net_test binary valid.
- * @param root The root folder to begin searching for kernel_net_test
- * @throws DeviceNotAvailableException
- */
- private String findRunKernelNetPath(String root) throws DeviceNotAvailableException {
- String mFoundPath;
- if (getDevice().isDirectory(root)) {
- // recursively find in all subdirectories
- for (String child : getDevice().getChildren(root)) {
- mFoundPath = findRunKernelNetPath(root + "/" + child);
- if (mFoundPath != null) {
- return mFoundPath;
- }
- }
- } else if (root.endsWith("/" + KERNEL_NET_TESTS)) {
- // It is a file and check the filename.
- return root;
- }
- return null;
- }
-}
diff --git a/testcases/host/selinux_test/Android.bp b/testcases/host/selinux_test/Android.bp
index c6109ad..a517b14 100644
--- a/testcases/host/selinux_test/Android.bp
+++ b/testcases/host/selinux_test/Android.bp
@@ -23,6 +23,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"general-tests",
- "vts-core",
+ "vts",
],
-}
\ No newline at end of file
+}