diff --git a/etc/run_in_headless_android_emulator.py b/etc/run_in_headless_android_emulator.py index a3b5d573ef95..e7c2f5c8fa36 100755 --- a/etc/run_in_headless_android_emulator.py +++ b/etc/run_in_headless_android_emulator.py @@ -66,8 +66,6 @@ def main(avd_name, apk_path, *args): # in case they say something useful while we wait in subsequent steps. logcat_args = [ "--format=raw", # Print no metadata, only log messages - "simpleservo:D", # Show (debug level) Rust stdio - "*:S", # Hide everything else ] with terminate_on_exit(adb + ["logcat"] + logcat_args) as logcat: diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index bd0271765f1f..5fcf915dff6b 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -605,11 +605,11 @@ def test_android_startup(self, release, dev): process = subprocess.Popen(args, stdout=subprocess.PIPE) try: while 1: - line = process.stdout.readline() + line = process.stdout.readline().decode('ascii', 'replace') if len(line) == 0: print("EOF without finding the expected line") return 1 - print(line.rstrip()) + sys.stdout.write(line) if "JavaScript is running!" in line: break finally: