mirror of
https://github.com/dart-lang/sdk
synced 2024-09-05 00:13:50 +00:00
Reland "Reland "update Glob in the sdk, also adds package:file to the sdk""
This reverts commit85174e4d8c
. Reason for revert: CL was OK, it looks like we just need a manual roll in order to add deps, only the HHH bots apply patches. EDIT: Landing file dep ahead of time in flutter/engine to avoid manual roll + patch. Original change's description: > Revert "Reland "update Glob in the sdk, also adds package:file to the sdk"" > > This reverts commitc62709e87b
. > > Reason for revert: Still breaking flutter HHH bots > > Original change's description: > > Reland "update Glob in the sdk, also adds package:file to the sdk" > > > > This reverts commitce614d33c4
. > > > > Original change's description: > > > Revert "update Glob in the sdk, also adds package:file to the sdk" > > > > > > This reverts commit18b19db300
. > > > > > > Reason for revert: Breaks Flutter 3H/Golem. Tried making an appropriate patch for 3H that would pull file into its dependencies (see https://dart-review.googlesource.com/c/sdk/+/173960/), but that still failed, so reverting. > > > > > > Original change's description: > > > > update Glob in the sdk, also adds package:file to the sdk > > > > > > > > Change-Id: Ia8628c28bfaf6343c19eecfef391339968cd57e9 > > > > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/172063 > > > > Commit-Queue: Jake Macdonald <jakemac@google.com> > > > > Reviewed-by: Nate Bosch <nbosch@google.com> > > > > > > TBR=jakemac@google.com,nbosch@google.com > > > > > > Change-Id: I0616e3df7505f348edeefee40cbaf4adc59487cd > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/173963 > > > Reviewed-by: Tess Strickland <sstrickl@google.com> > > > Commit-Queue: Tess Strickland <sstrickl@google.com> > > > > TBR=jakemac@google.com,nbosch@google.com,sstrickl@google.com > > > > # Not skipping CQ checks because this is a reland. > > > > Change-Id: Ia85fe3b81214ca4ef2bed8e08ecc1b617927a579 > > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/173981 > > Reviewed-by: Nate Bosch <nbosch@google.com> > > Commit-Queue: Jake Macdonald <jakemac@google.com> > > TBR=jakemac@google.com,nbosch@google.com,sstrickl@google.com > > Change-Id: Iaff06dcbc3ef813ee9edb5ca8de163fdcc2041e2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174060 > Reviewed-by: Jake Macdonald <jakemac@google.com> > Commit-Queue: Jake Macdonald <jakemac@google.com> TBR=jakemac@google.com,nbosch@google.com,sstrickl@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: If2181a9d5ec6b96d6a61cd5cf8857bddd937e59f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174382 Reviewed-by: Jake Macdonald <jakemac@google.com> Reviewed-by: Alexander Aprelev <aam@google.com> Commit-Queue: Jake Macdonald <jakemac@google.com>
This commit is contained in:
parent
4185e7ccd2
commit
bf24df2671
|
@ -257,6 +257,12 @@
|
|||
"packageUri": "lib/",
|
||||
"languageVersion": "2.12"
|
||||
},
|
||||
{
|
||||
"name": "file",
|
||||
"rootUri": "../third_party/pkg/file/packages/file",
|
||||
"packageUri": "lib/",
|
||||
"languageVersion": "2.12"
|
||||
},
|
||||
{
|
||||
"name": "fixnum",
|
||||
"rootUri": "../third_party/pkg/fixnum",
|
||||
|
@ -284,7 +290,7 @@
|
|||
"name": "glob",
|
||||
"rootUri": "../third_party/pkg/glob",
|
||||
"packageUri": "lib/",
|
||||
"languageVersion": "2.2"
|
||||
"languageVersion": "2.12"
|
||||
},
|
||||
{
|
||||
"name": "html",
|
||||
|
|
6
DEPS
6
DEPS
|
@ -104,7 +104,8 @@ vars = {
|
|||
"dartdoc_rev" : "d79877d0764ce23ffea7055049f8da5dffce0308",
|
||||
"ffi_rev": "a5d4232cd38562c75a3ed847baa340e399538028",
|
||||
"fixnum_rev": "16d3890c6dc82ca629659da1934e412292508bba",
|
||||
"glob_rev": "e9f4e6b7ae8abe5071461cf8f47191bb19cf7ef6",
|
||||
"file_rev": "0e09370f581ab6388d46fda4cdab66638c0171a1",
|
||||
"glob_rev": "7c0ef8d4fa086f6b185c4dd724b700e7d7ad8f79",
|
||||
"html_rev": "22f17e97fedeacaa1e945cf84d8016284eed33a6",
|
||||
"http_io_rev": "2fa188caf7937e313026557713f7feffedd4978b",
|
||||
"http_multi_server_rev" : "f1d1c9c024a293ab0a0e16f8b7632e87c708b448",
|
||||
|
@ -335,6 +336,9 @@ deps = {
|
|||
Var("dart_git") + "ffi.git" + "@" + Var("ffi_rev"),
|
||||
Var("dart_root") + "/third_party/pkg/fixnum":
|
||||
Var("dart_git") + "fixnum.git" + "@" + Var("fixnum_rev"),
|
||||
Var("dart_root") + "/third_party/pkg/file":
|
||||
Var("dart_git") + "external/github.com/google/file.dart/"
|
||||
+ "@" + Var("file_rev"),
|
||||
Var("dart_root") + "/third_party/pkg/glob":
|
||||
Var("dart_git") + "glob.git" + "@" + Var("glob_rev"),
|
||||
Var("dart_root") + "/third_party/pkg/html":
|
||||
|
|
|
@ -298,8 +298,8 @@ class Safari extends Browser {
|
|||
// We run killAndResetSafari in a Zone as opposed to running an external
|
||||
// process. The Zone allows us to collect its output, and protect the rest
|
||||
// of the test infrastructure against errors in it.
|
||||
runZoned(zoneWrapper,
|
||||
zoneSpecification: specification, onError: handleUncaughtError);
|
||||
runZonedGuarded(zoneWrapper, handleUncaughtError,
|
||||
zoneSpecification: specification);
|
||||
|
||||
try {
|
||||
await completer.future;
|
||||
|
|
|
@ -862,7 +862,6 @@ class StandardTestSuite extends TestSuite {
|
|||
|
||||
print("Cannot create URL for path $file. Not in build or dart directory.");
|
||||
exit(1);
|
||||
throw "unreachable";
|
||||
}
|
||||
|
||||
String _uriForBrowserTest(String pathComponent) {
|
||||
|
|
|
@ -22,10 +22,14 @@ dependencies:
|
|||
dev_dependencies:
|
||||
expect:
|
||||
path: ../expect
|
||||
glob:
|
||||
path: ../../third_party/pkg/glob
|
||||
file: any
|
||||
glob: any
|
||||
dependency_overrides:
|
||||
# Other packages in the dependency graph have normal hosted dependencies on
|
||||
# this, so just override it to force the local one.
|
||||
args:
|
||||
path: ../../third_party/pkg/args
|
||||
file:
|
||||
path: ../../third_party/pkg/file/packages/file
|
||||
glob:
|
||||
path: ../../third_party/pkg/glob
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
import 'dart:io';
|
||||
|
||||
import 'package:args/args.dart';
|
||||
import 'package:file/file.dart' as pkg_file;
|
||||
import 'package:glob/glob.dart';
|
||||
import 'package:glob/list_local_fs.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
|
||||
import 'package:test_runner/src/command_output.dart';
|
||||
|
@ -130,7 +132,7 @@ Future<void> main(List<String> args) async {
|
|||
for (var entry in glob.listSync(root: root)) {
|
||||
if (!entry.path.endsWith(".dart")) continue;
|
||||
|
||||
if (entry is File) {
|
||||
if (entry is pkg_file.File) {
|
||||
await _processFile(entry,
|
||||
dryRun: dryRun,
|
||||
remove: removeSources,
|
||||
|
|
Loading…
Reference in a new issue