From 1c840e6f01f510f079f94f2c1bf2a402414317b7 Mon Sep 17 00:00:00 2001 From: "whesse@google.com" Date: Thu, 6 Nov 2014 15:28:56 +0000 Subject: [PATCH] Re-land r41544 "Update dart binaries used for running tests to version 1.7.2" This also re-lands r41546, and some status file updates. BUG=dartbug.com/21525 21526 21527 R=ricow@google.com Review URL: https://codereview.chromium.org//701413002 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@41562 260f80e4-7a28-3924-810f-c04153c831b5 --- tests/co19/co19-dartium.status | 35 ++++++++++++++++------------- tests/html/html.status | 4 ++++ tests/html/xhr_test.dart | 9 ++++---- tools/testing/dart/http_server.dart | 6 +++-- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/tests/co19/co19-dartium.status b/tests/co19/co19-dartium.status index 4b68427321b..7fbd13ccc01 100644 --- a/tests/co19/co19-dartium.status +++ b/tests/co19/co19-dartium.status @@ -2,22 +2,6 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -LayoutTests/fast/borders/border-radius-child_t01: Skip # co19 issue 732. -LayoutTests/fast/css-generated-content/hit-test-generated-content_t01: Skip # co19 issue 732. -LayoutTests/fast/css/collapsed-whitespace-reattach-in-style-recalc_t01: Skip # co19 issue 732. -LayoutTests/fast/events/document-elementFromPoint_t01: Skip # co19 issue 732. -LayoutTests/fast/sub-pixel/float-containing-block-with-margin_t01: Skip # co19 issue 732. -LayoutTests/fast/sub-pixel/table-rows-have-stable-height_t01: Skip # co19 issue 732. -LayoutTests/fast/table/col-width-span-expand_t01: Skip # co19 issue 732. -LayoutTests/fast/text-autosizing/vertical-writing-mode_t01: Skip # co19 issue 732. -LayoutTests/fast/text/international/rtl-text-wrapping_t01: Skip # co19 issue 732. -LayoutTests/fast/writing-mode/positionForPoint_t01: Skip # co19 issue 732. -LayoutTests/fast/css/computed-offset-with-zoom_t01: Skip # co19 issue 732. -LayoutTests/fast/sub-pixel/inline-block-with-padding_t01: Skip # co19 issue 732. -LayoutTests/fast/sub-pixel/size-of-span-with-different-positions_t01: Skip # co19 issue 732. -LayoutTests/fast/text/international/complex-text-rectangle_t01: Skip # co19 issue 732. -LayoutTests/fast/text/line-breaks-after-hyphen-before-number_t01: Skip # co19 issue 732. - [ $compiler == none && $runtime == drt ] *: Skip # running co19 tests on content_shell would make our dartium cycle-times very long @@ -32,6 +16,25 @@ LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551_t01 LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video_t01: Skip # Issue 20540 [ $compiler == none && ($runtime == dartium || $runtime == ContentShellOnAndroid) ] +LayoutTests/fast/events/event-on-xhr-document_t01: RuntimeError # Issue 21525 +LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-document_t01 # Issue 21525 +LayoutTests/fast/xmlhttprequest/xmlhttprequest-responseXML-xml-document-responsetype_t01 # Issue 21525 +LayoutTests/fast/xpath/4XPath/Borrowed/od_20000608_t01 # Issue 21525 +LayoutTests/fast/borders/border-radius-child_t01: Skip # co19 issue 732. +LayoutTests/fast/css-generated-content/hit-test-generated-content_t01: Skip # co19 issue 732. +LayoutTests/fast/css/collapsed-whitespace-reattach-in-style-recalc_t01: Skip # co19 issue 732. +LayoutTests/fast/events/document-elementFromPoint_t01: Skip # co19 issue 732. +LayoutTests/fast/sub-pixel/float-containing-block-with-margin_t01: Skip # co19 issue 732. +LayoutTests/fast/sub-pixel/table-rows-have-stable-height_t01: Skip # co19 issue 732. +LayoutTests/fast/table/col-width-span-expand_t01: Skip # co19 issue 732. +LayoutTests/fast/text-autosizing/vertical-writing-mode_t01: Skip # co19 issue 732. +LayoutTests/fast/text/international/rtl-text-wrapping_t01: Skip # co19 issue 732. +LayoutTests/fast/writing-mode/positionForPoint_t01: Skip # co19 issue 732. +LayoutTests/fast/css/computed-offset-with-zoom_t01: Skip # co19 issue 732. +LayoutTests/fast/sub-pixel/inline-block-with-padding_t01: Skip # co19 issue 732. +LayoutTests/fast/sub-pixel/size-of-span-with-different-positions_t01: Skip # co19 issue 732. +LayoutTests/fast/text/international/complex-text-rectangle_t01: Skip # co19 issue 732. +LayoutTests/fast/text/line-breaks-after-hyphen-before-number_t01: Skip # co19 issue 732. LibTest/html/Window/document_A01_t01: RuntimeError # Issue 20146 LibTest/html/Window/postMessage_A01_t02: RuntimeError # Issue 20146 LibTest/html/Window/moveBy_A01_t01: RuntimeError # Issue 20146 diff --git a/tests/html/html.status b/tests/html/html.status index b0f6b4f186e..f95d10af8d1 100644 --- a/tests/html/html.status +++ b/tests/html/html.status @@ -308,6 +308,7 @@ xhr_test/xhr: Pass, Fail # Issue 11602 dart_object_local_storage_test: Skip # sessionStorage NS_ERROR_DOM_NOT_SUPPORTED_ERR webgl_1_test: Pass, Fail # Issue 8219 canvasrenderingcontext2d_test/drawImage_video_element_dataUrl: Fail # Firefox does not like dataUrl videos for drawImage +canvasrenderingcontext2d_test/drawImage_video_element: RuntimeError # Issue 21526 # Firefox Feature support statuses- # All changes should be accompanied by platform support annotation changes. @@ -353,6 +354,9 @@ wheelevent_test: Fail # http://dartbug.com/12958 # Desktop operation systems do not support touch events on chrome 34 dartium. touchevent_test/supported: Fail +[ ($runtime == dartium || $runtime == ie10) && ($system == macos || $system == windows)] +xhr_test/xhr: Skip # Times out. Issue 21527 + [ $compiler == none && $runtime == dartium ] async_test: Timeout # Issue 13719: Please triage this failure. element_offset_test/offset: Pass, Fail # Issue 13719, 13296 diff --git a/tests/html/xhr_test.dart b/tests/html/xhr_test.dart index 5759222e528..186b596345d 100644 --- a/tests/html/xhr_test.dart +++ b/tests/html/xhr_test.dart @@ -248,10 +248,11 @@ main() { test('xhr responseHeaders', () { return HttpRequest.request(url).then( (xhr) { - var serverHeader = xhr.responseHeaders['server']; - expect(serverHeader, isNotNull); - // Should be like: 'Dart/0.1 (dart:io)' - expect(serverHeader.startsWith('Dart/'), isTrue); + var contentTypeHeader = xhr.responseHeaders['content-type']; + expect(contentTypeHeader, isNotNull); + // Should be like: 'text/plain; charset=utf-8' + expect(contentTypeHeader.contains('text/plain'), isTrue); + expect(contentTypeHeader.contains('charset=utf-8'), isTrue); }); }); }); diff --git a/tools/testing/dart/http_server.dart b/tools/testing/dart/http_server.dart index a5e7b8eba15..e45c27ddbbb 100644 --- a/tools/testing/dart/http_server.dart +++ b/tools/testing/dart/http_server.dart @@ -56,7 +56,7 @@ class DispatchingServer { /// /root_build/X: This will serve the corresponding file from the build /// directory (i.e. '$BuildDirectory/X'). /// /FOO/packages/BAR: This will serve the corresponding file from the packages -/// directory (i.e. '$BuildDirectory/packages/BAR') or the +/// directory (i.e. '$BuildDirectory/packages/BAR') or the /// passed-in package root /// /ws: This will upgrade the connection to a WebSocket connection and echo /// all data back to the client. @@ -144,7 +144,7 @@ class TestingServers { _buildDirectory = TestUtils.absolutePath(buildDirectory); _dartDirectory = dartDirectory == null ? TestUtils.dartDir : new Path(dartDirectory); - _packageRoot = packageRoot == null ? + _packageRoot = packageRoot == null ? _buildDirectory.append('packages') : new Path(packageRoot); } @@ -399,6 +399,8 @@ class TestingServers { response.headers.set('Content-Type', 'application/javascript'); } else if (path.filename.endsWith('.dart')) { response.headers.set('Content-Type', 'application/dart'); + } else if (path.filename.endsWith('.css')) { + response.headers.set('Content-Type', 'text/css'); } response.headers.removeAll("X-Frame-Options"); file.openRead().pipe(response).catchError((e) {