Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev

Author: guang-google

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]

tests/DumpRenderTree/assets/run_page_cycler.py

@@ -85,6 +85,8 @@ def main(options, args):
 
   run_load_test_cmd += run_load_test_cmd_postfix
 
+  print run_load_test_cmd
+
   (adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
   fail_flag = False
   for line in adb_output.splitlines():
@@ -113,7 +115,7 @@ def main(options, args):
     logging.error("Cannot create results dir: " + results_dir)
     sys.exit(1)
 
-  result_file = "/sdcard/load_test_result.txt"
+  result_file = "/sdcard/0/load_test_result.txt"
   shell_cmd_str = adb_cmd + " pull " + result_file + " " + results_dir
   (adb_output, err) = subprocess.Popen(
       shell_cmd_str, shell=True,