diff options
| author | Steve Block <steveblock@google.com> | 2011-05-23 12:14:12 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 18:46:35 +0100 |
| commit | 183c3c9ca20f55703f31e3610bca72682f6355db (patch) | |
| tree | b6871e4bd4703bd1b9dcfc314d34a4d51a763e3f /tests/DumpRenderTree2 | |
| parent | 31e446c3db9031f69641c8ce7be8e396aeb60caa (diff) | |
| download | frameworks_base-183c3c9ca20f55703f31e3610bca72682f6355db.zip frameworks_base-183c3c9ca20f55703f31e3610bca72682f6355db.tar.gz frameworks_base-183c3c9ca20f55703f31e3610bca72682f6355db.tar.bz2 | |
Update DRT2 to reflect WebKit code movement
See http://trac.webkit.org/changeset/74301
Change-Id: Ibe495cdc1f50f65db5663dbb63af9b9c2db050d0
Diffstat (limited to 'tests/DumpRenderTree2')
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/DumpRenderTree2/assets/run_apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py index b4a8685..3806599 100755 --- a/tests/DumpRenderTree2/assets/run_apache2.py +++ b/tests/DumpRenderTree2/assets/run_apache2.py @@ -79,8 +79,8 @@ def main(run_cmd, options): # complete set of tests and the required scripts. directives += " -c \"DocumentRoot " + os.path.join(layout_tests_path, "http", "tests/") + "\"" directives += " -c \"Alias /LayoutTests " + layout_tests_path + "\"" - directives += " -c \"Alias /WebKitTools/DumpRenderTree/android " + \ - os.path.join(webkit_path, "WebKitTools", "DumpRenderTree", "android") + "\"" + directives += " -c \"Alias /Tools/DumpRenderTree/android " + \ + os.path.join(webkit_path, "Tools", "DumpRenderTree", "android") + "\"" directives += " -c \"Alias /ThirdPartyProject.prop " + \ os.path.join(webkit_path, "ThirdPartyProject.prop") + "\"" diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FsUtils.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FsUtils.java index d1aba43..54cbfda 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FsUtils.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FsUtils.java @@ -63,7 +63,7 @@ public class FsUtils { public static final String LOG_TAG = "FsUtils"; private static final String SCRIPT_URL = ForwarderManager.getHostSchemePort(false) + - "WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php"; + "Tools/DumpRenderTree/android/get_layout_tests_dir_contents.php"; private static final int HTTP_TIMEOUT_MS = 5000; diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java index 65c6964..bae8e6b 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java @@ -568,7 +568,7 @@ public class Summarizer { URL url = null; try { url = new URL("http", "localhost", ForwarderManager.HTTP_PORT, - "/WebKitTools/DumpRenderTree/android/view_source.php?src=" + + "/Tools/DumpRenderTree/android/view_source.php?src=" + relativePath); } catch (MalformedURLException e) { assert false : "relativePath=" + relativePath; |