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

Read package_config.json in more tests

Browse source 
Towards #48275

R=mit@google.com

Change-Id: I38cc986937543c5e4d1f2a2cd4c7804d180a2741
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244304
Commit-Queue: Nate Bosch <nbosch@google.com>
Reviewed-by: Michael Thomsen <mit@google.com>
Commit-Queue: Michael Thomsen <mit@google.com>
Auto-Submit: Nate Bosch <nbosch@google.com>
This commit is contained in:
Nate Bosch 2022-05-11 18:58:44 +00:00 committed by Commit Bot
parent ba05fc9f1d
commit 3c231e4f57
19 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/compiler/test/end_to_end/dill_loader_test.dart
View file

@ -28,7 +28,7 @@ main() {
var options = CompilerOptions()
..target = Dart2jsTarget("dart2js", TargetFlags(enableNullSafety: true))
..nnbdMode = NnbdMode.Strong
..packagesFileUri = Uri.base.resolve('.packages')
..packagesFileUri = Uri.base.resolve('.dart_tool/package_config.json')
..additionalDills = <Uri>[
computePlatformBinariesLocation().resolve("dart2js_platform.dill"),
]

3
pkg/compiler/test/end_to_end/no_platform_test.dart
View file

@ -22,7 +22,8 @@ main() {
new Dart2jsTarget('dart2js', new TargetFlags()),
sdkLibrariesSpecificationUri,
[], // additionalDills
Uri.base.resolve('.packages'), // packagesFileUri
Uri.base
.resolve('.dart_tool/package_config.json'), // packagesFileUri
explicitExperimentalFlags: experimentalFlags,
verify: true);
ir.Component component = await fe.compile(

4
pkg/compiler/test/helpers/memory_compiler.dart
View file

@ -133,8 +133,8 @@ Compiler compilerFor(
packageConfig = Uri.base.resolve(Platform.packageConfig);
} else {
// The tests are run with the base directory as the SDK root
// so just use the .packages file there.
packageConfig = Uri.base.resolve('.packages');
// so just use the package config there.
packageConfig = Uri.base.resolve('.dart_tool/package_config.json');
}
}

4
pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart
View file

@ -59,8 +59,10 @@ class DevCompilerRunner implements CompilerRunner {
var ddcSdkSummary = findInOutDir('ddc_outline.dill');
var packageConfigPath =
sdkRoot.uri.resolve('.dart_tool/package_config.json').toFilePath();
var args = <String>[
"--packages=${sdkRoot.uri.resolve(".packages").toFilePath()}",
'--packages=$packageConfigPath',
'--modules=es6',
'--dart-sdk-summary=${ddcSdkSummary.path}',
'-o',

6
pkg/front_end/test/async_but_no_await_git_test.dart
View file

@ -31,11 +31,11 @@ Set<Uri> libUris = {};
Future<void> main(List<String> args) async {
api.CompilerOptions compilerOptions = getOptions();
Uri dotPackagesUri = repoDir.resolve(".packages");
if (!new File.fromUri(dotPackagesUri).existsSync()) {
Uri packageConfigUri = repoDir.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packageConfigUri).existsSync()) {
throw "Couldn't find .packages";
}
compilerOptions.packagesFileUri = dotPackagesUri;
compilerOptions.packagesFileUri = packageConfigUri;
ProcessedOptions options = new ProcessedOptions(options: compilerOptions);

8
pkg/front_end/test/comments_on_certain_arguments_tool.dart
View file

@ -61,11 +61,11 @@ late Component component;
Future<void> main(List<String> args) async {
api.CompilerOptions compilerOptions = getOptions();
Uri dotPackagesUri = repoDir.resolve(".packages");
if (!new File.fromUri(dotPackagesUri).existsSync()) {
throw "Couldn't find .packages";
Uri packageConfigUri = repoDir.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packageConfigUri).existsSync()) {
throw "Couldn't find .dart_tool/package_config.json";
}
compilerOptions.packagesFileUri = dotPackagesUri;
compilerOptions.packagesFileUri = packageConfigUri;
ProcessedOptions options = new ProcessedOptions(options: compilerOptions);

10
pkg/front_end/test/deps_git_test.dart
View file

@ -49,11 +49,11 @@ Future<void> main() async {
Ticker ticker = new Ticker(isVerbose: false);
CompilerOptions compilerOptions = getOptions();
Uri dotPackagesUri = repoDir.resolve(".packages");
if (!new File.fromUri(dotPackagesUri).existsSync()) {
throw "Couldn't find .packages";
Uri packageConfigUri = repoDir.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packageConfigUri).existsSync()) {
throw "Couldn't find .dart_tool/package_config.json";
}
compilerOptions.packagesFileUri = dotPackagesUri;
compilerOptions.packagesFileUri = packageConfigUri;
ProcessedOptions options = new ProcessedOptions(options: compilerOptions);
@ -123,7 +123,7 @@ Future<void> main() async {
// * Everything else is an error.
// Remove white-listed non-dart files.
otherNonDartUris.remove(dotPackagesUri);
otherNonDartUris.remove(packageConfigUri);
otherNonDartUris.remove(repoDir.resolve("sdk/lib/libraries.json"));
otherNonDartUris.remove(repoDir.resolve(".dart_tool/package_config.json"));

8
pkg/front_end/test/explicit_creation_git_test.dart
View file

@ -49,11 +49,11 @@ Future<void> main(List<String> args) async {
Ticker ticker = new Ticker(isVerbose: false);
api.CompilerOptions compilerOptions = getOptions();
Uri dotPackagesUri = repoDir.resolve(".packages");
if (!new File.fromUri(dotPackagesUri).existsSync()) {
throw "Couldn't find .packages";
Uri packageConfigUri = repoDir.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packageConfigUri).existsSync()) {
throw "Couldn't find .dart_tool/package_config.json";
}
compilerOptions.packagesFileUri = dotPackagesUri;
compilerOptions.packagesFileUri = packageConfigUri;
ProcessedOptions options = new ProcessedOptions(options: compilerOptions);

2
pkg/front_end/test/fasta/incremental_hello_test.dart
View file

@ -37,7 +37,7 @@ void diagnosticMessageHandler(DiagnosticMessage message) {
Future<void> test({required bool sdkFromSource}) async {
final CompilerOptions optionBuilder = new CompilerOptions()
..packagesFileUri = Uri.base.resolve(".packages")
..packagesFileUri = Uri.base.resolve(".dart_tool/package_config.json")
..target = new VmTarget(new TargetFlags())
..omitPlatform = true
..onDiagnostic = diagnosticMessageHandler

2
pkg/front_end/test/fasta/testing/suite.dart
View file

@ -537,7 +537,7 @@ class FastaContext extends ChainContext with MatchContext {
UriTranslator? uriTranslator = _uriTranslators[uriConfiguration];
if (uriTranslator == null) {
Uri sdk = Uri.base.resolve("sdk/");
Uri packages = Uri.base.resolve(".packages");
Uri packages = Uri.base.resolve(".dart_tool/package_config.json");
FolderOptions folderOptions = computeFolderOptions(description);
CompilerOptions compilerOptions = new CompilerOptions()
..onDiagnostic = (DiagnosticMessage message) {

3
pkg/front_end/test/fasta/types/dill_hierarchy_test.dart
View file

@ -86,7 +86,8 @@ class F implements D<int, bool>;""",
final CompilerContext context = new CompilerContext(new ProcessedOptions(
options: new CompilerOptions()
..packagesFileUri = Uri.base.resolve(".packages")));
..packagesFileUri =
Uri.base.resolve(".dart_tool/package_config.json")));
asyncTest(() => context.runInContext<void>((_) async {
DillTarget target = new DillTarget(

3
pkg/front_end/test/fasta/types/fasta_legacy_upper_bound_test.dart
View file

@ -66,7 +66,8 @@ void main() {
final Ticker ticker = new Ticker();
final CompilerContext context = new CompilerContext(new ProcessedOptions(
options: new CompilerOptions()
..packagesFileUri = Uri.base.resolve(".packages")));
..packagesFileUri =
Uri.base.resolve(".dart_tool/package_config.json")));
context.runInContext<void>(
(_) => new FastaLegacyUpperBoundTest(ticker, context).test());
}

3
pkg/front_end/test/fasta/types/fasta_types_test.dart
View file

@ -42,7 +42,8 @@ void main() {
final Ticker ticker = new Ticker(isVerbose: false);
final CompilerContext context = new CompilerContext(new ProcessedOptions(
options: new CompilerOptions()
..packagesFileUri = Uri.base.resolve(".packages")));
..packagesFileUri =
Uri.base.resolve(".dart_tool/package_config.json")));
final Uri uri = Uri.parse("dart:core");
final TypeParserEnvironment environment = new TypeParserEnvironment(uri, uri);
final Component sdk = parseSdk(uri, environment);

3
pkg/front_end/test/fasta/types/subtypes_benchmark.dart
View file

@ -138,7 +138,8 @@ Future<void> run(Uri benchmarkInput, String name) async {
final CompilerContext context = new CompilerContext(new ProcessedOptions(
options: new CompilerOptions()
..packagesFileUri = Uri.base.resolve(".packages")));
..packagesFileUri =
Uri.base.resolve(".dart_tool/package_config.json")));
await context.runInContext<void>((_) async {
DillTarget target = new DillTarget(
ticker,

4
pkg/front_end/test/outline_extractor_suite.dart
View file

@ -100,7 +100,7 @@ class OutlineExtractorStep
@override
Future<Result<TestDescription>> run(
TestDescription description, Context context) async {
Uri? packages = description.uri.resolve(".packages");
Uri? packages = description.uri.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packages).existsSync()) {
packages = null;
}
@ -142,7 +142,7 @@ class CompileAndCompareStep
@override
Future<Result<TestDescription>> run(
TestDescription description, Context context) async {
Uri? packages = description.uri.resolve(".packages");
Uri? packages = description.uri.resolve(".dart_tool/package_config.json");
if (!new File.fromUri(packages).existsSync()) {
packages = null;
}

2
pkg/front_end/test/outline_extractor_tester.dart
View file

@ -18,7 +18,7 @@ import 'package:package_config/package_config.dart';
Future<void> main(List<String> args) async {
if (args.length != 1) throw "Wants 1 argument.";
Uri input = Uri.base.resolve(args.single);
Uri packageUri = input.resolve(".packages");
Uri packageUri = input.resolve(".dart_tool/package_config.json");
Stopwatch stopwatch = new Stopwatch()..start();
PackageConfig packageFile = await loadPackageConfigUri(packageUri);
print("Read packages file in ${stopwatch.elapsedMilliseconds} ms");

2
pkg/front_end/test/packages_format_error_test.dart
View file

@ -26,7 +26,7 @@ import 'package:front_end/src/fasta/messages.dart'
void main() {
Uri root = Uri.parse("org-dartlang-test:///");
MemoryFileSystem fs = new MemoryFileSystem(root);
Uri packages = root.resolve(".packages");
Uri packages = root.resolve(".dart_tool/package_config.json");
fs.entityForUri(packages).writeAsStringSync("bad\n");
List<DiagnosticMessage> messages = <DiagnosticMessage>[];
CompilerContext c = new CompilerContext(new ProcessedOptions(

2
pkg/front_end/test/parts/parts_test.dart
View file

@ -13,7 +13,7 @@ Future<void> main() async {
Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
CompilerOptions options = new CompilerOptions()
..sdkRoot = computePlatformBinariesLocation()
..packagesFileUri = Uri.base.resolve('.packages');
..packagesFileUri = Uri.base.resolve('.dart_tool/package_config.json');
for (FileSystemEntity dir in dataDir.listSync()) {
if (dir is Directory) {
print('Compiling ${dir.path}');

2
pkg/testing/lib/src/discover.dart
View file

@ -62,7 +62,7 @@ Stream<FileBasedTestDescription> listTests(List<Uri> testRoots,
Uri computePackageConfig() {
String? path = Platform.packageConfig;
if (path != null) return Uri.base.resolve(path);
return Uri.base.resolve(".packages");
return Uri.base.resolve(".dart_tool/package_config.json");
}
// TODO(eernst): Use `bool.hasEnvironment` below when possible;