maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[asan] Use full binary path in the Android test runner. 

Summary:
This prevents the confusion when there are similarly named tests in
different configurations (like in test/sanitizer_common).

Reviewers: vitalybuka

Subscribers: srhines, llvm-commits, kubamracek

Differential Revision: https://reviews.llvm.org/D38526

llvm-svn: 315011
This commit is contained in:
Evgeniy Stepanov 2017-10-05 20:00:19 +00:00
parent 3b87cc910e
commit 4a3e502d5d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler-rt/test/sanitizer_common/android_commands/android_common.py
View File

@ -1,4 +1,4 @@
import os, subprocess, tempfile import os, sys, subprocess, tempfile
import time import time
ANDROID_TMPDIR = '/data/local/tmp/Output' ANDROID_TMPDIR = '/data/local/tmp/Output'
@ -8,6 +8,11 @@ verbose = False
if os.environ.get('ANDROID_RUN_VERBOSE') == '1': if os.environ.get('ANDROID_RUN_VERBOSE') == '1':
verbose = True verbose = True
def host_to_device_path(path):
rel = os.path.relpath(path, "/")
dev = os.path.join(ANDROID_TMPDIR, rel)
return dev
def adb(args, attempts = 1): def adb(args, attempts = 1):
if verbose: if verbose:
print args print args
@ -37,5 +42,5 @@ def pull_from_device(path):
return text return text
def push_to_device(path): def push_to_device(path):
dst_path = os.path.join(ANDROID_TMPDIR, os.path.basename(path)) dst_path = host_to_device_path(path)
adb(['push', path, dst_path], 5) adb(['push', path, dst_path], 5)

3
compiler-rt/test/sanitizer_common/android_commands/android_run.py
View File

@ -5,8 +5,7 @@ from android_common import *
ANDROID_TMPDIR = '/data/local/tmp/Output' ANDROID_TMPDIR = '/data/local/tmp/Output'
here = os.path.abspath(os.path.dirname(sys.argv[0])) device_binary = host_to_device_path(sys.argv[0])
device_binary = os.path.join(ANDROID_TMPDIR, os.path.basename(sys.argv[0]))
def build_env(): def build_env():
args = [] args = []