LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run device tests as the shell user.

Browse Source 
A handful of the std::filesystem tests assume non-root (such as
checking readability of a file that has mode 000). We probably
shouldn't be running as root for these tests anyway.

Test: ./run_tests.py --bitness 32
Test: ./run_tests.py --bitness 64
Bug: None
Change-Id: Ifc661bd245c3d802d8816d1c098b0e47d011c4fa
This commit is contained in:
Dan Albert
2018-12-14 14:59:57 -08:00
parent a319cc895c
commit 35cb7a0541
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
run_tests.py
View File

@@ -142,6 +142,14 @@ def get_build_cmds(bitness, host):
return extract_build_cmds(commands, os.path.basename(target)) return extract_build_cmds(commands, os.path.basename(target))
def setup_test_directory():
"""Prepares a device test directory for use by the shell user."""
device_dir = '/data/local/tmp/libcxx'
check_call(['adb', 'shell', 'rm', '-rf', device_dir])
check_call(['adb', 'shell', 'mkdir', '-p', device_dir])
check_call(['adb', 'shell', 'chown', '-R', 'shell:shell', device_dir])
def main(): def main():
"""Program entry point.""" """Program entry point."""
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
@@ -176,6 +184,9 @@ def main():
have_filter_args = True have_filter_args = True
break # No need to keep scanning. break # No need to keep scanning.
if not args.host:
setup_test_directory()
lit_args = [ lit_args = [
'-sv', android_mode_arg, cxx_under_test_arg, cxx_template_arg, '-sv', android_mode_arg, cxx_under_test_arg, cxx_template_arg,
link_template_arg, libcxx_site_cfg_arg, libcxxabi_site_cfg_arg link_template_arg, libcxx_site_cfg_arg, libcxxabi_site_cfg_arg

4
utils/libcxx/android/executors.py
View File

@@ -16,7 +16,7 @@ class AdbExecutor(libcxx.test.executor.RemoteExecutor):
def _remote_temp(self, is_dir): def _remote_temp(self, is_dir):
dir_arg = '-d' if is_dir else '' dir_arg = '-d' if is_dir else ''
cmd = 'mktemp -q {} /data/local/tmp/libcxx.XXXXXXXXXX'.format(dir_arg) cmd = 'mktemp -q {} /data/local/tmp/libcxx/temp.XXXXXX'.format(dir_arg)
_, temp_path, err, exitCode = self._execute_command_remote([cmd]) _, temp_path, err, exitCode = self._execute_command_remote([cmd])
temp_path = temp_path.strip() temp_path = temp_path.strip()
if exitCode != 0: if exitCode != 0:
@@ -32,7 +32,7 @@ class AdbExecutor(libcxx.test.executor.RemoteExecutor):
adb_cmd.extend(['-s', self.serial]) adb_cmd.extend(['-s', self.serial])
delimiter = 'x' delimiter = 'x'
probe_cmd = ' '.join(cmd) + '; echo {}$?'.format(delimiter) probe_cmd = 'su shell {}; echo {}$?'.format(' '.join(cmd), delimiter)
env_cmd = [] env_cmd = []
if env is not None: if env is not None: