Commit b8227914 authored by bangfu.tao's avatar bangfu.tao Committed by Commit bot

Bug fix: android-run.py

BUG=
A bug in android-run.py, which caused the android_arm.release.check throws error:

data/local/tmp/v8/test/mjsunit/wasm/function-prototype.js:7: Error loading file

load("test/mjsunit/wasm/wasm-constants.js");

Review-Url: https://codereview.chromium.org/2070323002
Cr-Commit-Position: refs/heads/master@{#37825}
parent ad93c01a
...@@ -88,7 +88,8 @@ def Main(): ...@@ -88,7 +88,8 @@ def Main():
print("Usage: %s <command-to-run-on-device>" % sys.argv[0]) print("Usage: %s <command-to-run-on-device>" % sys.argv[0])
return 1 return 1
workspace = abspath(join(dirname(sys.argv[0]), '..')) workspace = abspath(join(dirname(sys.argv[0]), '..'))
android_workspace = os.getenv("ANDROID_V8", "/data/local/tmp/v8") v8_root = "/data/local/tmp/v8"
android_workspace = os.getenv("ANDROID_V8", v8_root)
args = [Escape(arg) for arg in sys.argv[1:]] args = [Escape(arg) for arg in sys.argv[1:]]
script = (" ".join(args) + "\n" script = (" ".join(args) + "\n"
"case $? in\n" "case $? in\n"
...@@ -99,7 +100,7 @@ def Main(): ...@@ -99,7 +100,7 @@ def Main():
script_file = WriteToTemporaryFile(script) script_file = WriteToTemporaryFile(script)
android_script_file = android_workspace + "/" + script_file android_script_file = android_workspace + "/" + script_file
command = ("adb push '%s' %s;" % (script_file, android_script_file) + command = ("adb push '%s' %s;" % (script_file, android_script_file) +
"adb shell 'sh %s';" % android_script_file + "adb shell 'cd %s && sh %s';" % (v8_root, android_script_file) +
"adb shell 'rm %s'" % android_script_file) "adb shell 'rm %s'" % android_script_file)
error_code = Execute(command) error_code = Execute(command)
os.unlink(script_file) os.unlink(script_file)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment