summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authordtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 05:47:39 +0000
committerdtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 05:47:39 +0000
commitebc6f0ab551100dca9d3a5fc142e8ce8a4dac9c7 (patch)
tree66aefc6de9070c69988d67bf166c327001ab38a0 /content
parent902bbb531c0376891f9e483217df49367fe4bf43 (diff)
downloadchromium_src-ebc6f0ab551100dca9d3a5fc142e8ce8a4dac9c7.zip
chromium_src-ebc6f0ab551100dca9d3a5fc142e8ce8a4dac9c7.tar.gz
chromium_src-ebc6f0ab551100dca9d3a5fc142e8ce8a4dac9c7.tar.bz2
[telemetry] Support absolute paths by changing file:/// to file://. More robust file path handling.
file:///a/b/c.html == absolute path. This follows RFC-1738 (empty hostname refers to localhost). file://a/b/c.html == relative path. In the RFC, "a" is technically the hostname, but we're just gonna use it as part of the path. http_server: - Support relative paths at the command-line for memory_cache_http_server. - Removal of duplicate paths. - Correct path prefix calculation. (commonprefix is a string prefix, not a path prefix.) - Correct UrlOf so it works based on path, not on an assumption that serving_dirs_and_file returns a specific value. page: - Remove _UrlPathJoin. Its behavior is awkward for absolute paths. Its backslash to slash conversion should be unnecessary if we always use proper OS paths (except in UrlOf). - Split serving_dirs_and_file into page.file_path, page.serving_dir, and page_set.serving_dirs. BUG=None. TEST=tools/telemetry/run_tests; tools/perf/run_tests; tools/perf/run_measurement blink_perf_all; tools/perf/run_benchmark sunspider; content/test/gpu/run_gpu_test webgl_conformance Review URL: https://codereview.chromium.org/24451002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/test/gpu/gpu_tests/webgl_conformance.py2
-rw-r--r--content/test/gpu/gpu_tests/webgl_robustness.py2
-rw-r--r--content/test/gpu/page_sets/pixel_tests.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/content/test/gpu/gpu_tests/webgl_conformance.py b/content/test/gpu/gpu_tests/webgl_conformance.py
index f65094f..afc0aad 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance.py
@@ -104,7 +104,7 @@ class WebglConformance(test_module.Test):
'name': 'WebglConformance.%s' %
test.replace('/', '_').replace('-', '_').
replace('\\', '_').rpartition('.')[0].replace('.', '_'),
- 'url': 'file:///' + test,
+ 'url': 'file://' + test,
'script_to_evaluate_on_commit': conformance_harness_script,
'navigate_steps': [
{'action': 'navigate'},
diff --git a/content/test/gpu/gpu_tests/webgl_robustness.py b/content/test/gpu/gpu_tests/webgl_robustness.py
index aefb8b9..4cdc4cb 100644
--- a/content/test/gpu/gpu_tests/webgl_robustness.py
+++ b/content/test/gpu/gpu_tests/webgl_robustness.py
@@ -55,7 +55,7 @@ class WebglRobustness(test.Test):
'serving_dirs': [''],
'pages': [
{
- 'url': 'file:///extra/lots-of-polys-example.html',
+ 'url': 'file://extra/lots-of-polys-example.html',
'script_to_evaluate_on_commit': robustness_harness_script,
'navigate_steps': [
{ 'action': 'navigate' },
diff --git a/content/test/gpu/page_sets/pixel_tests.json b/content/test/gpu/page_sets/pixel_tests.json
index bd83281..b96dd86 100644
--- a/content/test/gpu/page_sets/pixel_tests.json
+++ b/content/test/gpu/page_sets/pixel_tests.json
@@ -3,7 +3,7 @@
"user_agent_type": "desktop",
"pages": [
{
- "url": "file:///../../data/gpu/pixel_webgl.html",
+ "url": "file://../../data/gpu/pixel_webgl.html",
"navigate_steps": [
{ "action": "navigate"},
{ "action": "wait", "seconds": 4 }