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

[eugenis]

Summary

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

[vitalybuka]

compiler-rt/test/sanitizer_common/android_commands/android_common.py

12 ↗

(On Diff #117615)

Thy this is relative to the / and not to maybe build root?

[eugenis]

compiler-rt/test/sanitizer_common/android_commands/android_common.py

12 ↗

(On Diff #117615)

This is more reliable, for example, you may run tests from two build trees on one device at the same time. Also, it is easier to implement - otherwise we would need to pass the build root to the script somehow.

compiler-rt/trunk/test/sanitizer_common/android_commands/android_common.py

-import os, subprocess, tempfile
+import os, sys, 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 host_to_device_path(path):
+    rel = os.path.relpath(path, "/")
+    dev = os.path.join(ANDROID_TMPDIR, rel)
+    return dev
+
 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

 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))
+    dst_path = host_to_device_path(path)
     adb(['push', path, dst_path], 5)

compiler-rt/trunk/test/sanitizer_common/android_commands/android_run.py

 #!/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]))
+device_binary = host_to_device_path(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', 'SCUDO_OPTIONS']:
             args.append('%s="%s"' % (key, value))