Skip to content

Commit

Permalink
Version 2.10.0-141.0.dev
Browse files Browse the repository at this point in the history
Merge commit 'aa705eb6f1f97855c6ce6c53c3d725197d9a97d4' into 'dev'
  • Loading branch information
Dart CI committed Sep 17, 2020
2 parents d290eab + aa705eb commit fcaedc6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
7 changes: 6 additions & 1 deletion pkg/front_end/test/explicit_creation_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import 'package:kernel/kernel.dart';
import 'package:kernel/target/targets.dart';
import "package:vm/target/vm.dart" show VmTarget;

import 'testing_utils.dart' show getGitFiles;

final Uri repoDir = _computeRepoDir();

Uri _computeRepoDir() {
Expand Down Expand Up @@ -77,10 +79,13 @@ Future<void> main(List<String> args) async {
}
}
for (Uri uri in libUris) {
Set<Uri> gitFiles = await getGitFiles(uri);
List<FileSystemEntity> entities =
new Directory.fromUri(uri).listSync(recursive: true);
for (FileSystemEntity entity in entities) {
if (entity is File && entity.path.endsWith(".dart")) {
if (entity is File &&
entity.path.endsWith(".dart") &&
gitFiles.contains(entity.uri)) {
options.inputs.add(entity.uri);
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/test/lint_suite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class Context extends ChainContext {
Stream<LintTestDescription> list(Chain suite) async* {
Set<Uri> gitFiles;
if (onlyInGit) {
gitFiles = await getGitFiles(suite);
gitFiles = await getGitFiles(suite.uri);
}

Directory testRoot = new Directory.fromUri(suite.uri);
Expand Down
8 changes: 4 additions & 4 deletions pkg/front_end/test/testing_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Stream<TestDescription> filterList(
Chain suite, bool onlyInGit, Stream<TestDescription> base) async* {
Set<Uri> gitFiles;
if (onlyInGit) {
gitFiles = await getGitFiles(suite);
gitFiles = await getGitFiles(suite.uri);
}
await for (TestDescription description in base) {
if (onlyInGit && !gitFiles.contains(description.uri)) {
Expand All @@ -20,14 +20,14 @@ Stream<TestDescription> filterList(
}
}

Future<Set<Uri>> getGitFiles(Chain suite) async {
Future<Set<Uri>> getGitFiles(Uri uri) async {
ProcessResult result = await Process.run("git", ["ls-files", "."],
workingDirectory: new Directory.fromUri(suite.uri).absolute.path,
workingDirectory: new Directory.fromUri(uri).absolute.path,
runInShell: true);
String stdout = result.stdout;
return stdout
.split(new RegExp('^', multiLine: true))
.map((line) => suite.uri.resolve(line.trimRight()))
.map((line) => uri.resolve(line.trimRight()))
.toSet();
}

Expand Down
1 change: 0 additions & 1 deletion pkg/kernel/lib/ast.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7111,7 +7111,6 @@ abstract class Name extends Node {

// TODO(johnniwinther): Remove this when dependent code has been updated to
// use [text].
@deprecated
String get name => text;

bool operator ==(other) {
Expand Down
2 changes: 1 addition & 1 deletion tools/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ CHANNEL dev
MAJOR 2
MINOR 10
PATCH 0
PRERELEASE 140
PRERELEASE 141
PRERELEASE_PATCH 0

0 comments on commit fcaedc6

Please sign in to comment.