[compiler-rt] r313443 - [sanitizer] Move android_commoands from asan into sanitizer_common
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 15 22:13:56 PDT 2017
Author: vitalybuka
Date: Fri Sep 15 22:13:56 2017
New Revision: 313443
URL: http://llvm.org/viewvc/llvm-project?rev=313443&view=rev
Log:
[sanitizer] Move android_commoands from asan into sanitizer_common
Added:
compiler-rt/trunk/test/sanitizer_common/android_commands/
compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py
compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py (with props)
compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py (with props)
Removed:
compiler-rt/trunk/test/asan/android_commands/
Modified:
compiler-rt/trunk/CMakeLists.txt
compiler-rt/trunk/test/asan/lit.cfg
compiler-rt/trunk/test/asan/lit.site.cfg.in
compiler-rt/trunk/test/lit.common.cfg
compiler-rt/trunk/test/lit.common.configured.in
Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=313443&r1=313442&r2=313443&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Fri Sep 15 22:13:56 2017
@@ -69,6 +69,7 @@ construct_compiler_rt_default_triple()
if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")
set(ANDROID 1)
endif()
+pythonize_bool(ANDROID)
set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=313443&r1=313442&r2=313443&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Fri Sep 15 22:13:56 2017
@@ -71,11 +71,6 @@ if config.compiler_id == 'GNU':
else:
extra_link_flags = []
-# BFD linker in 64-bit android toolchains fails to find libm.so, which is a
-# transitive shared library dependency (via asan runtime).
-if config.android:
- extra_link_flags += ["-lm"]
-
# Setup default compiler flags used with -fsanitize=address option.
# FIXME: Review the set of required flags and check if it can be reduced.
target_cflags = [get_required_attr(config, "target_cflags")] + extra_link_flags
@@ -110,12 +105,6 @@ if platform.system() == 'Windows':
win_runtime_feature = "win32-static-asan"
config.available_features.add(win_runtime_feature)
-asan_lit_source_dir = get_required_attr(config, "asan_lit_source_dir")
-if config.android == "1":
- config.available_features.add('android')
- compile_wrapper = os.path.join(asan_lit_source_dir, "android_commands", "android_compile.py") + " "
- config.compile_wrapper = compile_wrapper
-
def build_invocation(compile_flags):
return " " + " ".join([config.compile_wrapper, config.clang] + compile_flags) + " "
@@ -178,7 +167,7 @@ python_exec = get_required_attr(config,
config.substitutions.append( ("%sancov ", python_exec + " " + sancov + " ") )
# Determine kernel bitness
-if config.host_arch.find('64') != -1 and config.android != "1":
+if config.host_arch.find('64') != -1 and not config.android:
kernel_bits = '64'
else:
kernel_bits = '32'
Modified: compiler-rt/trunk/test/asan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.site.cfg.in?rev=313443&r1=313442&r2=313443&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/asan/lit.site.cfg.in Fri Sep 15 22:13:56 2017
@@ -2,11 +2,9 @@
# Tool-specific config options.
config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@"
-config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@"
config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@"
config.clang = "@ASAN_TEST_TARGET_CC@"
config.bits = "@ASAN_TEST_BITS@"
-config.android = "@ANDROID@"
config.ios = @ASAN_TEST_IOS_PYBOOL@
config.iossim = @ASAN_TEST_IOSSIM_PYBOOL@
config.asan_dynamic = @ASAN_TEST_DYNAMIC@
Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=313443&r1=313442&r2=313443&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Fri Sep 15 22:13:56 2017
@@ -52,6 +52,11 @@ else:
# Add compiler ID to the list of available features.
config.available_features.add(compiler_id)
+# BFD linker in 64-bit android toolchains fails to find libm.so, which is a
+# transitive shared library dependency (via asan runtime).
+if config.android:
+ config.target_cflags += " -lm"
+
# Clear some environment variables that might affect Clang.
possibly_dangerous_env_vars = ['ASAN_OPTIONS', 'DFSAN_OPTIONS', 'LSAN_OPTIONS',
'MSAN_OPTIONS', 'UBSAN_OPTIONS',
@@ -99,7 +104,6 @@ if config.emulator:
config.compile_wrapper = ""
elif config.ios:
config.available_features.add('ios')
-
device_id_env = "SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER" if config.iossim else "SANITIZER_IOS_TEST_DEVICE_IDENTIFIER"
if device_id_env in os.environ: config.environment[device_id_env] = os.environ[device_id_env]
ios_commands_dir = os.path.join(config.compiler_rt_src_root, "test", "sanitizer_common", "ios_commands")
@@ -109,6 +113,12 @@ elif config.ios:
config.substitutions.append(('%env ', env_wrapper + " "))
compile_wrapper = os.path.join(ios_commands_dir, "iossim_compile.py" if config.iossim else "ios_compile.py")
config.compile_wrapper = compile_wrapper
+elif config.android:
+ config.available_features.add('android')
+ compile_wrapper = os.path.join(config.compiler_rt_src_root, "test", "sanitizer_common", "android_commands", "android_compile.py") + " "
+ config.compile_wrapper = compile_wrapper
+ config.substitutions.append( ('%run', "") )
+ config.substitutions.append( ('%env ', "env ") )
else:
config.substitutions.append( ('%run', "") )
config.substitutions.append( ('%env ', "env ") )
Modified: compiler-rt/trunk/test/lit.common.configured.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?rev=313443&r1=313442&r2=313443&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.configured.in (original)
+++ compiler-rt/trunk/test/lit.common.configured.in Fri Sep 15 22:13:56 2017
@@ -32,6 +32,7 @@ set_default("has_lld", @COMPILER_RT_HAS_
set_default("can_symbolize", @CAN_SYMBOLIZE@)
set_default("use_lld", False)
set_default("use_thinlto", False)
+set_default("android", @ANDROID_PYBOOL@)
config.available_features.add('target-is-%s' % config.target_arch)
# LLVM tools dir can be passed in lit parameters, so try to
Added: compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py?rev=313443&view=auto
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py (added)
+++ compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py Fri Sep 15 22:13:56 2017
@@ -0,0 +1,41 @@
+import os, subprocess, tempfile
+import time
+
+ANDROID_TMPDIR = '/data/local/tmp/Output'
+ADB = os.environ.get('ADB', 'adb')
+
+verbose = False
+if os.environ.get('ANDROID_RUN_VERBOSE') == '1':
+ verbose = True
+
+def adb(args, attempts = 1):
+ if verbose:
+ print args
+ tmpname = tempfile.mktemp()
+ out = open(tmpname, 'w')
+ ret = 255
+ while attempts > 0 and ret != 0:
+ attempts -= 1
+ ret = subprocess.call([ADB] + args, stdout=out, stderr=subprocess.STDOUT)
+ if attempts != 0:
+ ret = 5
+ if ret != 0:
+ print "adb command failed", args
+ print tmpname
+ out.close()
+ out = open(tmpname, 'r')
+ print out.read()
+ out.close()
+ os.unlink(tmpname)
+ return ret
+
+def pull_from_device(path):
+ tmp = tempfile.mktemp()
+ adb(['pull', path, tmp], 5)
+ text = open(tmp, 'r').read()
+ os.unlink(tmp)
+ return text
+
+def push_to_device(path):
+ dst_path = os.path.join(ANDROID_TMPDIR, os.path.basename(path))
+ adb(['push', path, dst_path], 5)
Added: compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py?rev=313443&view=auto
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py (added)
+++ compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py Fri Sep 15 22:13:56 2017
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+import os, sys, subprocess
+from android_common import *
+
+
+here = os.path.abspath(os.path.dirname(sys.argv[0]))
+android_run = os.path.join(here, 'android_run.py')
+
+output = None
+output_type = 'executable'
+
+args = sys.argv[1:]
+while args:
+ arg = args.pop(0)
+ if arg == '-shared':
+ output_type = 'shared'
+ elif arg == '-c':
+ output_type = 'object'
+ elif arg == '-o':
+ output = args.pop(0)
+
+if output == None:
+ print "No output file name!"
+ sys.exit(1)
+
+ret = subprocess.call(sys.argv[1:])
+if ret != 0:
+ sys.exit(ret)
+
+if output_type in ['executable', 'shared']:
+ push_to_device(output)
+
+if output_type == 'executable':
+ os.rename(output, output + '.real')
+ os.symlink(android_run, output)
Propchange: compiler-rt/trunk/test/sanitizer_common/android_commands/android_compile.py
------------------------------------------------------------------------------
svn:executable = *
Added: compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py?rev=313443&view=auto
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py (added)
+++ compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py Fri Sep 15 22:13:56 2017
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+import os, signal, sys, subprocess, tempfile
+from android_common import *
+
+ANDROID_TMPDIR = '/data/local/tmp/Output'
+
+here = os.path.abspath(os.path.dirname(sys.argv[0]))
+device_binary = os.path.join(ANDROID_TMPDIR, os.path.basename(sys.argv[0]))
+
+def build_env():
+ args = []
+ # Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir.
+ args.append('LD_LIBRARY_PATH=%s' % (ANDROID_TMPDIR,))
+ for (key, value) in os.environ.items():
+ if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
+ args.append('%s="%s"' % (key, value))
+ return ' '.join(args)
+
+is_64bit = (subprocess.check_output(['file', sys.argv[0] + '.real']).find('64-bit') != -1)
+
+device_env = build_env()
+device_args = ' '.join(sys.argv[1:]) # FIXME: escape?
+device_stdout = device_binary + '.stdout'
+device_stderr = device_binary + '.stderr'
+device_exitcode = device_binary + '.exitcode'
+ret = adb(['shell', 'cd %s && %s %s %s >%s 2>%s ; echo $? >%s' %
+ (ANDROID_TMPDIR, device_env, device_binary, device_args,
+ device_stdout, device_stderr, device_exitcode)])
+if ret != 0:
+ sys.exit(ret)
+
+sys.stdout.write(pull_from_device(device_stdout))
+sys.stderr.write(pull_from_device(device_stderr))
+retcode = int(pull_from_device(device_exitcode))
+# If the device process died with a signal, do abort().
+# Not exactly the same, but good enough to fool "not --crash".
+if retcode > 128:
+ os.kill(os.getpid(), signal.SIGABRT)
+sys.exit(retcode)
Propchange: compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py
------------------------------------------------------------------------------
svn:executable = *
More information about the llvm-commits
mailing list