Fix some tests and exclude others from CRLF rewriting.

R=whesse@google.com
BUG=

Review URL: https://codereview.chromium.org//1212823002.
This commit is contained in:
Stephan Herhut 2015-06-26 14:40:01 +02:00
parent e7e3706c59
commit 225be75498
12 changed files with 30 additions and 11 deletions

11
.gitattributes vendored
View file

@ -10,11 +10,16 @@
*.md text
*.yaml text
# Windows files that should not be converted.
tests/lib/mirrors/method_mirror_source_line_ending_cr.dart -text
tests/lib/mirrors/method_mirror_source_line_ending_crlf.dart -text
# Files that should not be converted.
tests/compiler/dart2js_extra/string_interpolation_test.dart -text
tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart -text
tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart -text
tests/language/raw_string_test.dart -text
tests/language/multiline_strings_test.dart -text
tests/lib/convert/json_pretty_test.dart -text
tests/lib/mirrors/method_mirror_source_line_ending_cr.dart -text
tests/lib/mirrors/method_mirror_source_line_ending_crlf.dart -text
pkg/js_ast/test/printer_callback_test.dart -text
# Files to leave alone and not diff.
*.png binary

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
// Test that JS printer callbacks occur when expected.
library js_ast.printer.callback_test;

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
import "package:expect/expect.dart";
main() {

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
import "package:expect/expect.dart";
import 'dart:math';

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
import "package:expect/expect.dart";
// Test that String interpolation works in the code generated by the leg

View file

@ -52,7 +52,9 @@ main() {
'xmlns="http://www.w3.org/2000/svg" />'));
expect(el.outerHtml, anyOf(svgContent,
'<svg xmlns="http://www.w3.org/2000/svg" version="1.1">\n '
'<circle />\n <path />\n</svg>'));
'<circle />\n <path />\n</svg>',
'<svg xmlns="http://www.w3.org/2000/svg" version="1.1">\r\n '
'<circle />\r\n <path />\r\n</svg>'));
});
test('has no parent', () =>

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
import "package:expect/expect.dart";
main() {

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
import "package:expect/expect.dart";
class RawStringTest {

View file

@ -2,6 +2,8 @@
// 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.
// Note: This test relies on LF line endings in the source file.
library json_pretty_test;
import 'dart:convert';

View file

@ -87,9 +87,8 @@ const List<int> testGreekUtf8 = const<int>[
0xbd, 0xb6, 0x20, 0xce, 0xbe, 0xce, 0xad, 0xcf,
0x86, 0xcf, 0x89, 0xcf, 0x84, 0xce, 0xbf];
const String testKatakanaPhrase = """
""";
const String testKatakanaPhrase = "イロハニホヘト チリヌルヲ ワカヨタレソ "
"ツネナラム ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン";
const List<int> testKatakanaUtf8 = const<int>[
0xe3, 0x82, 0xa4, 0xe3, 0x83, 0xad, 0xe3, 0x83,
@ -101,7 +100,7 @@ const List<int> testKatakanaUtf8 = const<int>[
0x82, 0xbf, 0xe3, 0x83, 0xac, 0xe3, 0x82, 0xbd,
0x20, 0xe3, 0x83, 0x84, 0xe3, 0x83, 0x8d, 0xe3,
0x83, 0x8a, 0xe3, 0x83, 0xa9, 0xe3, 0x83, 0xa0,
0x0a, 0xe3, 0x82, 0xa6, 0xe3, 0x83, 0xb0, 0xe3,
0x20, 0xe3, 0x82, 0xa6, 0xe3, 0x83, 0xb0, 0xe3,
0x83, 0x8e, 0xe3, 0x82, 0xaa, 0xe3, 0x82, 0xaf,
0xe3, 0x83, 0xa4, 0xe3, 0x83, 0x9e, 0x20, 0xe3,
0x82, 0xb1, 0xe3, 0x83, 0x95, 0xe3, 0x82, 0xb3,

View file

@ -1 +1 @@
// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file // 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. // This file is marked executable so source control will preserve the type of // line ending. library line_endings.cr; oneLineCR(x) => x; multiLineCR(y) { return y + 1; } b (){ }
// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file // 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. // Note: This test relies on CR line endings in the source file. library line_endings.cr; oneLineCR(x) => x; multiLineCR(y) { return y + 1; } b (){ }

View file

@ -2,8 +2,7 @@
// 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.
// This file is marked executable so source control will preserve the type of
// line ending.
// Note: This test relies on CRLF line endings in the source file.
library line_endings.crlf;