aboutsummaryrefslogtreecommitdiff
path: root/tools/run_android_test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/run_android_test')
-rwxr-xr-xtools/run_android_test6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/run_android_test b/tools/run_android_test
index 27fd273e5..470779659 100755
--- a/tools/run_android_test
+++ b/tools/run_android_test
@@ -90,6 +90,8 @@ def AdbCall(*args):
def AdbPush(host, device):
+ if not os.path.exists(host):
+ logging.fatal('Cannot find %s. Was it built?', host)
cmd = [ADB_PATH, 'push', host, device]
print '> adb push ' + ' '.join(cmd[2:])
with open(os.devnull) as devnull:
@@ -154,6 +156,10 @@ def Main():
# See https://android.googlesource.com/platform/system/core/+/master/rootdir/etc/ld.config.txt.
AdbPush(test_bin, "/data/nativetest")
+ # These two binaries are required to run perfetto_integrationtests.
+ AdbPush(os.path.join(args.out_dir, "perfetto"), "/data/nativetest")
+ AdbPush(os.path.join(args.out_dir, "trigger_perfetto"), "/data/nativetest")
+
if not args.no_data_deps:
for dep in EnumerateDataDeps():
AdbPush(os.path.join(ROOT_DIR, dep), target_dir + '/' + dep)