13 Commits

Author SHA1 Message Date
Steve Block
183c3c9ca2 Update DRT2 to reflect WebKit code movement
See http://trac.webkit.org/changeset/74301

Change-Id: Ibe495cdc1f50f65db5663dbb63af9b9c2db050d0
2011-05-24 18:46:35 +01:00
Steve Block
ae47ce0046 Improve error handling in DumpRenderTree2 scripts
Change-Id: Idba4acc22dd037a001ea5c05cbd6a29292f6de2c
2010-10-18 20:20:41 +01:00
Steve Block
0e1d6876f9 Fix a bug in DumpRenderTree2's run_apache2.py script
We use a printf style approach when setting the run command in the
command string to be executed. When doing so, the printf must be
applied to only the relevant part of the string. This avoids problems
in the case that other parts of the string contain special character
sequences, such as '%s' in a custom log directive.

Change-Id: I87df773a2872320386a34cb6a5041a9e0ba6f31e
2010-09-22 15:33:05 +01:00
Steve Block
76c97ee414 Fix DumpRenderTree2 to serve HTTP tests on http://127.0.0.1:8000
Currently DumpRenderTree2 serves HTTP tests on http://localhost:8080.
Some of the tests hardcode 'http://127.0.0.1:8000' for resources, so
we must use this scheme and port for the requests to be same-origin.

This fixes LayoutTest http/tests/appcache/credential-url.html

Change-Id: I2a9c402fc7b0e0b62eb4a278d67ac0e63ef96e8b
2010-09-17 16:12:21 +01:00
Maksymilian Osowski
4af7705631 Changed the behaviour of run_apache2.py restart.
Now it explicitly stops and starts the server and not just invokes apache2 -k restart

Change-Id: I74cfa9c3388552fcc56b62c5ab614262ca540d0b
2010-09-17 15:27:34 +01:00
Maksymilian Osowski
78fbc54c18 Changed run_layout_tests.py and run_apache2.py to accept alternative tests root dir.
Change-Id: I6d0537b6712ca6f68ec004e5e8bf95b97b9017fc
2010-09-17 12:18:56 +01:00
Steve Block
0e2bae14b4 Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION
We now use ThirdPartyProject.prop
See https://android-git.corp.google.com/g/#change,64831

Change-Id: Ib52fdd93ac08fb19ec8b7f539eb084c0b668e01b
2010-09-07 22:05:21 +01:00
Maksymilian Osowski
5846d4561d Fixed the run_apache2.py script to use the correct mime.types file.
Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210
2010-09-03 17:03:33 +01:00
Maksymilian Osowski
2ca8acdb56 Adds webkit revision to the summary and details.
The revision number is taken from external/webkit/WEBKIT_MERGE_REVISION and is served to the java code by apache server. To be able to do that, the new alias directive had to be
added to the run_apache2.py script.

Bug: 2889572
Change-Id: Ie3d147e4d8ea9edd0144b819152121563b8bd759
2010-09-02 17:27:35 +01:00
Steve Block
9d660cb5f3 Update run_apach2.py to serve HTTP tests at server root
The complete set of layout tests is still available at /LayoutTests
and scripts at /WebKitTools/DumpRenderTree/android.

Note that this requires a corresponding change to
external/webkit/WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php

Bug: 2951727
Change-Id: Idf366942ffd5786759c989e992359b7e7dbb182c
2010-08-26 16:57:17 +01:00
Steve Block
ee273fac7f Use locals to make run_apache2.py more readable
Also fixes style

Change-Id: I8045b7deb5badfed7758be459d05c58d0ff2e390
2010-08-26 16:56:44 +01:00
Maksymilian Osowski
fe33f987cb Updated the script to include access log.
Change-Id: I3c97d60580040fa8e4bf63660091edb9c7a871fb
2010-08-26 15:25:02 +01:00
Steve Block
0e4d86fddf Fix naming and executable bits on DumpRenderTree2 scripts
Change-Id: Id1415e2a166289c8c585e132e842f5ca6ad35426
2010-08-18 15:50:46 +01:00