diff options
| author | Guang Zhu <guangzhu@google.com> | 2011-01-12 22:57:41 -0800 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2011-01-12 22:57:41 -0800 |
| commit | 71716223201a01a4f4b6fe182ad97720b7d06124 (patch) | |
| tree | dd64b1bfe4fb614edb55a0723148496645a7cf42 /tests/DumpRenderTree/src | |
| parent | 63be8dd178447fce289c940638cd37aa560d9de3 (diff) | |
| download | frameworks_base-71716223201a01a4f4b6fe182ad97720b7d06124.zip frameworks_base-71716223201a01a4f4b6fe182ad97720b7d06124.tar.gz frameworks_base-71716223201a01a4f4b6fe182ad97720b7d06124.tar.bz2 | |
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
Diffstat (limited to 'tests/DumpRenderTree/src')
3 files changed, 12 insertions, 12 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java index 73d7363..4a47a0e 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java @@ -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(); } @@ -189,7 +189,7 @@ public abstract class FileList extends ListActivity protected int mBaseLength; protected String mFocusFile; protected int mFocusIndex; - + private final static int OPEN_DIRECTORY = 0; private final static int RUN_TESTS = 1; diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java index 5d34e25..b7d2c26 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java @@ -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 diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java index 8aa3c69..050b779 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java @@ -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", |