Upgrade to the new test runner. R=rnystrom@google.com Review URL: https://codereview.chromium.org//1234433006 .
diff --git a/pkgs/glob/.gitignore b/pkgs/glob/.gitignore index 388eff0..7dbf035 100644 --- a/pkgs/glob/.gitignore +++ b/pkgs/glob/.gitignore
@@ -3,6 +3,7 @@ .pub/ build/ packages +.packages # Or the files created by dart2js. *.dart.js
diff --git a/pkgs/glob/.status b/pkgs/glob/.status deleted file mode 100644 index 28a4a30..0000000 --- a/pkgs/glob/.status +++ /dev/null
@@ -1,18 +0,0 @@ -# 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. - -# Skip non-test files ending with "_test". -packages/*: Skip -*/packages/*: Skip -*/*/packages/*: Skip -*/*/*/packages/*: Skip -*/*/*/*packages/*: Skip -*/*/*/*/*packages/*: Skip - -# Only run tests from the build directory, since we don't care about the -# difference between transformed an untransformed code. -test/*: Skip - -[ $browser ] -*: Fail, OK # Uses dart:io.
diff --git a/pkgs/glob/.test_config b/pkgs/glob/.test_config new file mode 100644 index 0000000..531426a --- /dev/null +++ b/pkgs/glob/.test_config
@@ -0,0 +1,5 @@ +{ + "test_package": { + "platforms": ["vm"] + } +} \ No newline at end of file
diff --git a/pkgs/glob/CHANGELOG.md b/pkgs/glob/CHANGELOG.md index 0532177..f8c00bc 100644 --- a/pkgs/glob/CHANGELOG.md +++ b/pkgs/glob/CHANGELOG.md
@@ -1,3 +1,10 @@ +## 1.0.5 + +* Narrow the dependency on `path`. Previously, this allowed versions that didn't + support all the functionality this package needs. + +* Upgrade to the new test runner. + ## 1.0.4 * Added overlooked `collection` dependency.
diff --git a/pkgs/glob/pubspec.yaml b/pkgs/glob/pubspec.yaml index 000cfa8..eb7816c 100644 --- a/pkgs/glob/pubspec.yaml +++ b/pkgs/glob/pubspec.yaml
@@ -1,12 +1,12 @@ name: glob -version: 1.0.4 +version: 1.0.5 author: "Dart Team <misc@dartlang.org>" homepage: https://github.com/dart-lang/glob description: Bash-style filename globbing. dependencies: collection: ">=1.1.0 <2.0.0" - path: ">=1.0.0 <2.0.0" + path: ">=1.3.0 <2.0.0" string_scanner: ">=0.1.0 <0.2.0" dev_dependencies: - unittest: ">=0.11.0 <0.12.0" - scheduled_test: ">=0.11.2 <0.12.0" + test: ">=0.12.0 <0.13.0" + scheduled_test: ">=0.12.0 <0.13.0"
diff --git a/pkgs/glob/test/glob_test.dart b/pkgs/glob/test/glob_test.dart index 34dbb65..a742f20 100644 --- a/pkgs/glob/test/glob_test.dart +++ b/pkgs/glob/test/glob_test.dart
@@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:glob/glob.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; void main() { group("Glob.quote()", () {
diff --git a/pkgs/glob/test/match_test.dart b/pkgs/glob/test/match_test.dart index 448d60c..90b5b7f 100644 --- a/pkgs/glob/test/match_test.dart +++ b/pkgs/glob/test/match_test.dart
@@ -5,7 +5,7 @@ import 'package:glob/glob.dart'; import 'package:glob/src/utils.dart'; import 'package:path/path.dart' as p; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; const RAW_ASCII_WITHOUT_SLASH = "\t\n\r !\"#\$%&'()*+`-.0123456789:;<=>?@ABCDEF" "GHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/pkgs/glob/test/parse_test.dart b/pkgs/glob/test/parse_test.dart index 11bf1f5..77dba95 100644 --- a/pkgs/glob/test/parse_test.dart +++ b/pkgs/glob/test/parse_test.dart
@@ -4,7 +4,7 @@ import 'package:glob/glob.dart'; import 'package:path/path.dart' as p; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; void main() { test("supports backslash-escaped characters", () {