Merge "Disable compression of logs in subprocess in sandbox"
diff --git a/atest/atest.py b/atest/atest.py
index 0a7c2ac..fe9b240 100755
--- a/atest/atest.py
+++ b/atest/atest.py
@@ -660,15 +660,8 @@
# Add module-info.json target to the list of build targets to keep the
# file up to date.
build_targets.add(mod_info.module_info_target)
- # Build the deps-license to generate dependencies data in
- # module-info.json.
- build_targets.add(constants.DEPS_LICENSE)
- # The environment variables PROJ_PATH and DEP_PATH are necessary for the
- # deps-license.
- build_env = dict(constants.DEPS_LICENSE_ENV)
build_start = time.time()
- success = atest_utils.build(build_targets, verbose=args.verbose,
- env_vars=build_env)
+ success = atest_utils.build(build_targets, verbose=args.verbose)
metrics.BuildFinishEvent(
duration=metrics_utils.convert_duration(time.time() - build_start),
success=success,
diff --git a/atest/constants_default.py b/atest/constants_default.py
index f730b60..2c892c7 100644
--- a/atest/constants_default.py
+++ b/atest/constants_default.py
@@ -199,12 +199,6 @@
# be generated when make.
ATEST_BUILD_ENV = {'SOONG_COLLECT_JAVA_DEPS':'true'}
-# For generating dependencies in module-info.json, appending deps-license in the
-# make command is a must. Also the environment variables PROJ_PATH and DEP_PATH
-# are necessary.
-DEPS_LICENSE = 'deps-license'
-DEPS_LICENSE_ENV = {'PROJ_PATH': '.', 'DEP_PATH': '.'}
-
# Atest index path and relative dirs/caches.
INDEX_DIR = os.path.join(os.getenv(ANDROID_HOST_OUT, ''), 'indexes')
LOCATE_CACHE = os.path.join(INDEX_DIR, 'mlocate.db')
@@ -234,3 +228,13 @@
ATEST_RESULT_ROOT = '/tmp/atest_result'
LATEST_RESULT_FILE = os.path.join(ATEST_RESULT_ROOT, 'LATEST', 'test_result')
+
+# Tests list which need vts_kernel_tests as test dependency
+REQUIRE_KERNEL_TEST_MODULES = [
+ 'vts_ltp_test_arm',
+ 'vts_ltp_test_arm64',
+ 'vts_linux_kselftest_arm_32',
+ 'vts_linux_kselftest_arm_64',
+ 'vts_linux_kselftest_x86_32',
+ 'vts_linux_kselftest_x86_64'
+]
diff --git a/atest/module_info.py b/atest/module_info.py
index 4ba36d8..d925548 100644
--- a/atest/module_info.py
+++ b/atest/module_info.py
@@ -80,9 +80,7 @@
logging.debug('Generating %s - this is required for '
'initial runs.', _MODULE_INFO)
build_env = dict(constants.ATEST_BUILD_ENV)
- build_env.update(constants.DEPS_LICENSE_ENV)
- # Also build the deps-license module to generate dependencies data.
- atest_utils.build([module_info_target, constants.DEPS_LICENSE],
+ atest_utils.build([module_info_target],
verbose=logging.getLogger().isEnabledFor(logging.DEBUG),
env_vars=build_env)
return module_info_target, module_file_path
diff --git a/atest/test_finders/module_finder.py b/atest/test_finders/module_finder.py
index 965688b..c64600e 100644
--- a/atest/test_finders/module_finder.py
+++ b/atest/test_finders/module_finder.py
@@ -186,6 +186,11 @@
for module_path in self.module_info.get_paths(module_name):
mod_dir = module_path.replace('/', '-')
targets.add(_MODULES_IN % mod_dir)
+ # (b/156457698) Force add vts_kernel_tests as build target if our test
+ # belong to REQUIRE_KERNEL_TEST_MODULES due to required_module option
+ # not working for sh_test in soong.
+ if module_name in constants.REQUIRE_KERNEL_TEST_MODULES:
+ targets.add('vts_kernel_tests')
return targets
def _get_module_test_config(self, module_name, rel_config=None):
diff --git a/res/config/simple-host.xml b/res/config/simple-host.xml
new file mode 100644
index 0000000..0ae9111
--- /dev/null
+++ b/res/config/simple-host.xml
@@ -0,0 +1,20 @@
+<?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 a single host based test on an existing device">
+
+ <test class="com.android.tradefed.testtype.HostTest" />
+
+</configuration>
