From 8aaa32b13e565893c57059ca14eb49fbe4bdf0ba Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Sun, 19 Aug 2012 15:27:40 -0700 Subject: fix sdcard path for webkit perf and layout test scripts paths are moved from /sdcard/ to /sdcard/0/ Change-Id: I27dee294eff033da47c5de17c3b7843790386be3 --- tests/DumpRenderTree/assets/run_layout_tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/DumpRenderTree/assets/run_layout_tests.py') diff --git a/tests/DumpRenderTree/assets/run_layout_tests.py b/tests/DumpRenderTree/assets/run_layout_tests.py index 21c02ec..dafb56b 100755 --- a/tests/DumpRenderTree/assets/run_layout_tests.py +++ b/tests/DumpRenderTree/assets/run_layout_tests.py @@ -58,7 +58,7 @@ def DumpRenderTreeFinished(adb_cmd): """ # pull /sdcard/webkit/running_test.txt, if the content is "#DONE", it's done - shell_cmd_str = adb_cmd + " shell cat /sdcard/webkit/running_test.txt" + shell_cmd_str = adb_cmd + " shell cat /sdcard/0/webkit/running_test.txt" adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] return adb_output.strip() == "#DONE" @@ -207,7 +207,7 @@ def main(options, args): # Get the running_test.txt logging.error("DumpRenderTree crashed, output:\n" + adb_output) - shell_cmd_str = adb_cmd + " shell cat /sdcard/webkit/running_test.txt" + shell_cmd_str = adb_cmd + " shell cat /sdcard/0/webkit/running_test.txt" crashed_test = "" while not crashed_test: (crashed_test, err) = subprocess.Popen( @@ -244,10 +244,10 @@ def main(options, args): logging.error("Cannot create results dir: " + results_dir); sys.exit(1); - result_files = ["/sdcard/layout_tests_passed.txt", - "/sdcard/layout_tests_failed.txt", - "/sdcard/layout_tests_ignored.txt", - "/sdcard/layout_tests_nontext.txt"] + result_files = ["/sdcard/0/layout_tests_passed.txt", + "/sdcard/0/layout_tests_failed.txt", + "/sdcard/0/layout_tests_ignored.txt", + "/sdcard/0/layout_tests_nontext.txt"] for file in result_files: shell_cmd_str = adb_cmd + " pull " + file + " " + results_dir adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] -- cgit v1.1