languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-05 09:20:04 +00:00
Code Issues Projects Releases Wiki Activity

move the third_party/pkg_tested packages into third_party/pkg

Browse Source 
Change-Id: I7e2499aafb1ae85da4699358909ac67337593a11
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/247927
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
This commit is contained in:
Devon Carew 2022-06-13 17:04:36 +00:00 committed by Commit Bot
parent 1c442cf9f0
commit 2acf036023
12 changed files with 37 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -319,7 +319,7 @@ deps = {
Var("dart_git") + "crypto.git" + "@" + Var("crypto_rev"),
Var("dart_root") + "/third_party/pkg/csslib":
Var("dart_git") + "csslib.git" + "@" + Var("csslib_rev"),
Var("dart_root") + "/third_party/pkg_tested/dart_style":
Var("dart_root") + "/third_party/pkg/dart_style":
Var("dart_git") + "dart_style.git" + "@" + Var("dart_style_rev"),
Var("dart_root") + "/third_party/pkg/dartdoc":
Var("dart_git") + "dartdoc.git" + "@" + Var("dartdoc_rev"),
@ -361,7 +361,7 @@ deps = {
Var("dart_git") + "mockito.git" + "@" + Var("mockito_rev"),
Var("dart_root") + "/third_party/pkg/oauth2":
Var("dart_git") + "oauth2.git" + "@" + Var("oauth2_rev"),
Var("dart_root") + "/third_party/pkg_tested/package_config":
Var("dart_root") + "/third_party/pkg/package_config":
Var("dart_git") + "package_config.git" +
"@" + Var("package_config_rev"),
Var("dart_root") + "/third_party/pkg/path":

24
pkg/front_end/test/deps_git_test.dart
View File

@ -23,21 +23,19 @@ import 'utils/io_utils.dart' show computeRepoDirUri;
final Uri repoDir = computeRepoDirUri();
Set<String> allowlistedExternalDartFiles = {
"third_party/pkg/charcode/lib/ascii.dart",
"third_party/pkg_tested/package_config/lib/package_config.dart",
"third_party/pkg_tested/package_config/lib/package_config_types.dart",
"third_party/pkg_tested/package_config/lib/src/discovery.dart",
"third_party/pkg_tested/package_config/lib/src/errors.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_impl.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_io.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_json.dart",
"third_party/pkg_tested/package_config/lib/src/package_config.dart",
"third_party/pkg_tested/package_config/lib/src/packages_file.dart",
"third_party/pkg_tested/package_config/lib/src/util.dart",
"third_party/pkg/package_config/lib/package_config.dart",
"third_party/pkg/package_config/lib/package_config_types.dart",
"third_party/pkg/package_config/lib/src/discovery.dart",
"third_party/pkg/package_config/lib/src/errors.dart",
"third_party/pkg/package_config/lib/src/package_config_impl.dart",
"third_party/pkg/package_config/lib/src/package_config_io.dart",
"third_party/pkg/package_config/lib/src/package_config_json.dart",
"third_party/pkg/package_config/lib/src/package_config.dart",
"third_party/pkg/package_config/lib/src/packages_file.dart",
"third_party/pkg/package_config/lib/src/util.dart",
// TODO(johnniwinther): Fix to allow dependency of package:package_config.
"third_party/pkg_tested/package_config/lib/src/util_io.dart",
"third_party/pkg/package_config/lib/src/util_io.dart",
// TODO(CFE-team): These files should not be included.
// The package isn't even in pubspec.yaml.

1
pkg/scrape/lib/scrape.dart
View File

@ -247,7 +247,6 @@ class Scrape {
// Don't care about cached packages.
if (entry.path.contains('sdk/third_party/pkg/')) continue;
if (entry.path.contains('sdk/third_party/pkg_tested/')) continue;
if (entry.path.contains('/.dart_tool/')) continue;
// Don't care about generated protobuf code.

21
pkg/test_runner/lib/src/test_configurations.dart
View File

@ -28,31 +28,32 @@ export 'configuration.dart' show TestConfiguration;
/// simpler to add them to test.dart. Existing test suites should be moved to
/// here, if possible.
final testSuiteDirectories = [
Path('third_party/pkg/dartdoc'),
Path('pkg'),
Path('third_party/pkg_tested'),
Path('runtime/tests/vm'),
Path('runtime/observatory/tests/service'),
Path('runtime/observatory/tests/observatory_ui'),
Path('runtime/observatory_2/tests/service_2'),
Path('runtime/observatory/tests/service'),
Path('runtime/observatory_2/tests/observatory_ui_2'),
Path('runtime/observatory_2/tests/service_2'),
Path('runtime/tests/vm'),
Path('samples'),
Path('samples_2'),
Path('samples-dev'),
Path('samples_2'),
Path('tests/corelib'),
Path('tests/corelib_2'),
Path('tests/web'),
Path('tests/web_2'),
Path('tests/dartdevc'),
Path('tests/dartdevc_2'),
Path('tests/ffi'),
Path('tests/ffi_2'),
Path('tests/language'),
Path('tests/language_2'),
Path('tests/lib'),
Path('tests/lib_2'),
Path('tests/standalone'),
Path('tests/standalone_2'),
Path('tests/ffi'),
Path('tests/ffi_2'),
Path('tests/web'),
Path('tests/web_2'),
Path('third_party/pkg/dart_style'),
Path('third_party/pkg/dartdoc'),
Path('third_party/pkg/package_config'),
Path('utils/tests/peg'),
];

1
third_party/.gitignore vendored
View File

@ -4,7 +4,6 @@
# except for our files in boringssl. The checkout is in boringssl/src.
!.gitignore
!pkg
!pkg_tested
!/tcmalloc
!d8
!firefox_jsshell

2
third_party/pkg_tested/OWNERS vendored
View File

@ -1,2 +0,0 @@
# Test status file
per-file pkg_tested.status=file:/tools/OWNERS_ENG

32
third_party/pkg_tested/pkg_tested.status vendored
View File

@ -1,32 +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.
# Don't run any test-like files that show up in packages directories. It
# shouldn't be necessary to run "pub install" in these packages, but if you do
# it shouldn't break the tests.
*/*/*/*/*/packages/*/*: Skip
*/*/*/*/packages/*/*: Skip
*/*/*/packages/*/*: Skip
*/*/packages/*/*: Skip
*/packages/*/*: Skip
[ $runtime == vm ]
http_io/test/http_cross_process_test: Skip # Fails with --no-preview-dart-2
http_io/test/http_proxy_advanced_test: Pass, RuntimeError # flaky
http_io/test/http_proxy_test: Pass, RuntimeError # flaky
[ $browser ]
dart_style/*: SkipByDesign
pub/*: SkipByDesign
[ $runtime == vm && $system == windows ]
pub/test/run/app_can_read_from_stdin_test: Fail # Issue 19448
pub/test/run/forwards_signal_posix_test: SkipByDesign
[ $runtime == vm && ($arch == simarm || $arch == simarm64 || $arch == simarm64c || $arch == simriscv32 || $arch == simriscv64 || $builder_tag == asan || $mode == debug) ]
dart_style/test/command_line_test: Skip # The test controller does not take into account that tests take much longer in debug mode or on simulators.
dart_style/test/formatter_test: Skip # The test controller does not take into account that tests take much longer in debug mode or on simulators.
[ $compiler == dart2js || $compiler == dartdevc || $compiler == dartdevk ]
http_io/*: SkipByDesign

24
tools/bots/test_matrix.json
View File

@ -7,7 +7,6 @@
".dart_tool/package_config.json",
"pkg/",
"third_party/pkg/",
"third_party/pkg_tested/",
"tools/",
"out/ReleaseX64/dart-sdk/",
"xcodebuild/ReleaseX64/dart-sdk/"
@ -50,7 +49,6 @@
"third_party/babel/babel.min.js",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseIA32/dart-sdk/",
@ -87,7 +85,6 @@
"third_party/babel/babel.min.js",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseIA32/dart-sdk/",
@ -134,7 +131,6 @@
"tests/ffi_2/",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseIA32/dart",
@ -173,7 +169,6 @@
"tests/ffi/",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseX64/dart",
@ -212,7 +207,6 @@
"tests/ffi/",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseX64/dart"
@ -258,7 +252,6 @@
"tests/ffi_2/",
"third_party/d8/",
"third_party/pkg/",
"third_party/pkg_tested/",
"third_party/requirejs/",
"tools/",
"xcodebuild/ReleaseIA32/",
@ -268,7 +261,6 @@
"runtime/tools/dartfuzz/",
"out/",
"third_party/pkg/",
"third_party/pkg_tested/",
"tools/sdks/dart-sdk/",
"pkg/_fe_analyzer_shared/",
"pkg/async_helper/",
@ -299,7 +291,6 @@
"third_party/devtools/",
"third_party/webdriver/",
"third_party/pkg/",
"third_party/pkg_tested/",
"tests/.dart_tool/package_config.json",
"tests/angular/",
"tests/co19/co19-analyzer.status",
@ -3721,10 +3712,11 @@
]
},
{
"name": "third_party pkg_tested unit tests",
"name": "third_party tested packages",
"arguments": [
"-nunittest-asserts-${mode}-${system}",
"pkg_tested"
"dart_style",
"package_config"
]
},
{
@ -3760,10 +3752,11 @@
]
},
{
"name": "third_party pkg_tested unit tests",
"name": "third_party tested packages",
"arguments": [
"-nunittest-asserts-${mode}-${system}-arm64",
"pkg_tested"
"dart_style",
"package_config"
]
},
{
@ -3800,10 +3793,11 @@
]
},
{
"name": "third_party pkg_tested unit tests",
"name": "third_party tested packages",
"arguments": [
"-nunittest-asserts-${mode}-${system}",
"pkg_tested"
"dart_style",
"package_config"
]
},
{

2
tools/bots/try_benchmarks.sh
View File

@ -152,7 +152,6 @@ for command; do
sdk \
samples-dev/swarm \
third_party/pkg \
third_party/pkg_tested \
.dart_tool/package_config.json \
pkg \
benchmarks \
@ -300,7 +299,6 @@ EOF
sdk \
samples-dev/swarm \
third_party/pkg \
third_party/pkg_tested \
.dart_tool/package_config.json \
pkg \
benchmarks \

4
tools/generate_package_config.dart
View File

@ -17,7 +17,6 @@ void main(List<String> args) {
var packageDirs = [
...listSubdirectories(platform('pkg')),
...listSubdirectories(platform('third_party/pkg')),
...listSubdirectories(platform('third_party/pkg_tested')),
platform('pkg/vm_service/test/test_package'),
platform(
'runtime/observatory_2/tests/service_2/observatory_test_package_2'),
@ -105,8 +104,7 @@ void main(List<String> args) {
'governed by a BSD-style license that can be found in the LICENSE file.',
],
'comment': [
'Package configuration for all packages in pkg/, third_party/pkg/, and',
'third_party/pkg_tested/',
'Package configuration for all packages in pkg/ and third_party/pkg/',
],
},
);

14
tools/package_deps/bin/package_deps.dart
View File

@ -69,10 +69,9 @@ void main(List<String> arguments) {
print('SDK DEPS');
print('');
List<String> deps = [...sdkDeps.pkgs, ...sdkDeps.testedPkgs]..sort();
List<String> deps = [...sdkDeps.pkgs]..sort();
for (var pkg in deps) {
final tested = sdkDeps.testedPkgs.contains(pkg);
print('package:$pkg${tested ? ' [tested]' : ''}');
print('package:$pkg');
}
// TODO(devoncarew): Find unused entries in the DEPS file.
@ -421,7 +420,6 @@ class SdkDeps {
final File file;
List<String> pkgs = [];
List<String> testedPkgs = [];
final Map<String, ResolvedDep> _resolvedPackageVersions = {};
@ -440,22 +438,15 @@ class SdkDeps {
// Var("dart_root") + "/third_party/pkg/dart2js_info":
final pkgRegExp = RegExp(r'"/third_party/pkg/(\S+)"');
// Var("dart_root") + "/third_party/pkg_tested/dart_style":
final testedPkgRegExp = RegExp(r'"/third_party/pkg_tested/(\S+)"');
for (var line in file.readAsLinesSync()) {
var pkgDep = pkgRegExp.firstMatch(line);
var testedPkgDep = testedPkgRegExp.firstMatch(line);
if (pkgDep != null) {
pkgs.add(pkgDep.group(1)!);
} else if (testedPkgDep != null) {
testedPkgs.add(testedPkgDep.group(1)!);
}
}
pkgs.sort();
testedPkgs.sort();
}
void _parseRepoPackageVersions() {
@ -464,7 +455,6 @@ class SdkDeps {
_findPackages(Directory(path.join('third_party', 'pkg')));
_findPackages(
Directory(path.join('third_party', 'pkg', 'file', 'packages')));
_findPackages(Directory(path.join('third_party', 'pkg_tested')));
if (verbose) {
print('Package versions in the SDK:');

3
tools/rev_sdk_deps.dart
View File

@ -114,8 +114,7 @@ class GClientHelper {
rev: (entry.value as Map)['rev'],
);
}).where((PackageDependency deps) {
return deps.entry.startsWith('sdk/third_party/pkg/') ||
deps.entry.startsWith('sdk/third_party/pkg_tested/');
return deps.entry.startsWith('sdk/third_party/pkg/');
}).where((PackageDependency deps) {
return !pinned.contains(deps.name);
}).toList();