Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: pkg/intl/test/message_extraction/message_extraction_test.dart

Issue 12448008: Fix windows and pub failures in intl tests (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/intl/test/message_extraction/message_extraction_test.dart
diff --git a/pkg/intl/test/message_extraction/message_extraction_test.dart b/pkg/intl/test/message_extraction/message_extraction_test.dart
index 8ff75ccc7529a642ae683d234b3bda96823eebd0..ff45d3e12e73b0be52e5a2ae6398b07fbd830c17 100644
--- a/pkg/intl/test/message_extraction/message_extraction_test.dart
+++ b/pkg/intl/test/message_extraction/message_extraction_test.dart
@@ -30,6 +30,13 @@ String _findPackageDir(executable) {
if (tail.contains('Release') || tail.contains('Debug')) {
return path.join(oneUp, 'packages/');
}
+ // Check for the case where we're running Release<arch>/dart-sdk/bin/dart
+ // (pub bots)
+ var threeUp = path.dirname(path.dirname(oneUp));
+ tail = path.basename(threeUp);
+ if (tail.contains('Release') || tail.contains('Debug')) {
+ return path.join(threeUp, 'packages/');
+ }
// Otherwise we will rely on the normal packages directory.
return null;
}
@@ -124,6 +131,11 @@ void verifyResult(results) {
var output = results.stdout;
var lines = output.split("\n");
+ // If it looks like these are CRLF delimited, then use that. Wish strings
+ // just implemented last.
Emily Fortuna 2013/03/14 21:45:50 can we file a bug on this? :-)
+ if (lines.first.codeUnits.last == "\r".codeUnits.first) {
+ lines = output.split("\r\n");
+ }
lineIterator = lines.iterator..moveNext();
verify("Printing messages for en_US");
verify("This is a message");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698