Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71716223 authored by Guang Zhu's avatar Guang Zhu
Browse files

change webkit test data path 

path changed from "/sdcard/android/" to "/sdcard/webkit/". the
old path clashes with "/sdcard/Android/" and has some odd issues
under FUSE

Change-Id: I57102dca99612bdd7b4d1f196e43436cd1276281
parent 63be8dd1

tests/DumpRenderTree/assets/run_layout_tests.py

+6 −6
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


  First, you need to get an SD card or sdcard image that has layout tests on it.

  Layout tests are in following directory:

    /sdcard/android/layout_tests

  For example, /sdcard/android/layout_tests/fast

    /sdcard/webkit/layout_tests

  For example, /sdcard/webkit/layout_tests/fast



  Usage:

    Run all tests under fast/ directory:
@@ -22,7 +22,7 @@ 
  use --refresh-test-list option *once* to re-generate test list on the card.



  Some other options are:

    --rebaseline generates expected layout tests results under /sdcard/android/expected_result/

    --rebaseline generates expected layout tests results under /sdcard/webkit/expected_result/

    --time-out-ms (default is 8000 millis) for each test

    --adb-options="-e" passes option string to adb

    --results-directory=..., (default is ./layout-test-results) directory name under which results are stored.
@@ -57,8 +57,8 @@ def DumpRenderTreeFinished(adb_cmd): 
    output: adb_cmd string

  """



  # pull /sdcard/android/running_test.txt, if the content is "#DONE", it's done

  shell_cmd_str = adb_cmd + " shell cat /sdcard/android/running_test.txt"

  # 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"

  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/android/running_test.txt"

    shell_cmd_str = adb_cmd + " shell cat /sdcard/webkit/running_test.txt"

    crashed_test = ""

    while not crashed_test:

      (crashed_test, err) = subprocess.Popen(

tests/DumpRenderTree/assets/run_page_cycler.py

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


  Usage:

    Run a single page cycler test:

      run_page_cycler.py "file:///sdcard/android/page_cycler/moz/start.html?auto=1\&iterations=10"

      run_page_cycler.py "file:///sdcard/webkit/page_cycler/moz/start.html\?auto=1\&iterations=10"

"""



import logging
@@ -32,7 +32,7 @@ def main(options, args): 


  # Include all tests if none are specified.

  if not args:

    print "need a URL, e.g. file:///sdcard/android/page_cycler/moz/start.html"

    print "need a URL, e.g. file:///sdcard/webkit/page_cycler/moz/start.html\?auto=1\&iterations=10"

    sys.exit(1)

  else:

    path = ' '.join(args);

tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public abstract class FileList extends ListActivity 
    }



    protected void setupPath() {

        mPath = Environment.getExternalStorageDirectory() + "/android/layout_tests";

        mPath = Environment.getExternalStorageDirectory() + "/webkit/layout_tests";

        mBaseLength = mPath.length();

    }

tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java

+5 −5
Original line number Diff line number Diff line
@@ -35,15 +35,15 @@ public class FsUtils { 
    private static final String LOGTAG = "FsUtils";

    static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();

    static final String HTTP_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/";

        EXTERNAL_DIR + "/webkit/layout_tests/http/tests/";

    static final String HTTPS_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/ssl/";

        EXTERNAL_DIR + "/webkit/layout_tests/http/tests/ssl/";

    static final String HTTP_LOCAL_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/local/";

        EXTERNAL_DIR + "/webkit/layout_tests/http/tests/local/";

    static final String HTTP_MEDIA_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/media/";

        EXTERNAL_DIR + "/webkit/layout_tests/http/tests/media/";

    static final String HTTP_WML_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/wml/";

        EXTERNAL_DIR + "/webkit/layout_tests/http/tests/wml/";



    private FsUtils() {

        //no creation of instances

tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java

+5 −5
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
    static final int DEFAULT_TIMEOUT_IN_MILLIS = 5000;



    static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();

    static final String LAYOUT_TESTS_ROOT = EXTERNAL_DIR + "/android/layout_tests/";

    static final String LAYOUT_TESTS_RESULT_DIR = EXTERNAL_DIR + "/android/layout_tests_results/";

    static final String ANDROID_EXPECTED_RESULT_DIR = EXTERNAL_DIR + "/android/expected_results/";

    static final String LAYOUT_TESTS_LIST_FILE = EXTERNAL_DIR + "/android/layout_tests_list.txt";

    static final String TEST_STATUS_FILE = EXTERNAL_DIR + "/android/running_test.txt";

    static final String LAYOUT_TESTS_ROOT = EXTERNAL_DIR + "/webkit/layout_tests/";

    static final String LAYOUT_TESTS_RESULT_DIR = EXTERNAL_DIR + "/webkit/layout_tests_results/";

    static final String ANDROID_EXPECTED_RESULT_DIR = EXTERNAL_DIR + "/webkit/expected_results/";

    static final String LAYOUT_TESTS_LIST_FILE = EXTERNAL_DIR + "/webkit/layout_tests_list.txt";

    static final String TEST_STATUS_FILE = EXTERNAL_DIR + "/webkit/running_test.txt";

    static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = {

          "results/layout_tests_passed.txt",

          "results/layout_tests_failed.txt",