mirror of
https://github.com/dart-lang/sdk
synced 2024-10-02 00:22:55 +00:00
cd2c566bcf
This reverts commit ff5f391c0a.
Reason for revert: The expect library is used by Flutter engine, and some of its tests use assertStatementsEnabled. There should be a migration path that doesn't require an atomic change, like adding the replacement api before removing the old one.
Original change's description:
> Tweak `expect.dart` library.
>
> Make API more consistent for a few methods.
> Reduce the number of language features used in tests:
> * Never iterating an iterable, always converting it
> using `.toList()` first and iterating using indices
> (fx `setEquals`).
> Also require a `List` in places where an `Iterable`
> wasn't necessary.
> * Avoid doing complicated computations that are also
> used for the error message. Do simple check first,
> then recompute to get better error messages
> (fx `allDistinct`).
>
> Renamed some rarely used members for consistency
> (`stringContainsInOrder`->`containsInOrder`,
> where other string-contains functions just start
> with `contains`, and `containsOneOf` -> `containsAny`
> to match `Iterable.any` phrasing, and also it accepts
> if containing at least one, not precisely one.)
>
> Removed a function that wasn't used anywhere.
>
> Moved `assertStatementsEnabled` to `variations.dart` as `asserts`.
> Removed `typeAssertionsEnabled` and `checkedModeEnabled`. The former used in one place, where it was replaced with `checkedImplicitDowncasts` from `variations.dart`, the latter wasn't used anywhere.
>
> Deprecates `package:expect/minitest.dart`. It was never intended
> to be used for new tests, only as a help to convert existing tests
> written against `package:unit_test`.
> All existing imports marked as `// ignore: deprecated_member_use`.
>
> Change-Id: I07e21d4c0f3ccf11b82ee34af2668fdbb22264d2
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352360
> Reviewed-by: Slava Egorov <vegorov@google.com>
> Reviewed-by: Ömer Ağacan <omersa@google.com>
> Reviewed-by: Nate Bosch <nbosch@google.com>
> Reviewed-by: Stephen Adams <sra@google.com>
> Commit-Queue: Lasse Nielsen <lrn@google.com>
Change-Id: I360b4347470a0bb2b63c3108e2b83ee2a771bf3f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362020
Reviewed-by: Nate Bosch <nbosch@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
Reviewed-by: Stephen Adams <sra@google.com>
Reviewed-by: Leaf Petersen <leafp@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: William Hesse <whesse@google.com>
102 lines
3.3 KiB
Dart
102 lines
3.3 KiB
Dart
// Copyright (c) 2020, 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.
|
|
import 'dart:io';
|
|
|
|
import 'package:expect/expect.dart';
|
|
import 'package:path/path.dart' as path;
|
|
|
|
final _execSuffix = Platform.isWindows ? '.exe' : '';
|
|
final _batchSuffix = Platform.isWindows ? '.bat' : '';
|
|
|
|
main() {
|
|
final buildDir = path.dirname(Platform.executable);
|
|
final sdkDir = path.dirname(path.dirname(buildDir));
|
|
final platformDill = path.join(buildDir, 'vm_platform_strong.dill');
|
|
final genKernel =
|
|
path.join(sdkDir, 'pkg', 'vm', 'tool', 'gen_kernel$_batchSuffix');
|
|
Expect.isTrue(File(genKernel).existsSync(),
|
|
"Can't locate gen_kernel$_batchSuffix on this platform");
|
|
Expect.isTrue(File(genKernel).existsSync(),
|
|
"Can't locate gen_kernel$_batchSuffix on this platform");
|
|
final genSnapshot = path.join(buildDir, 'gen_snapshot$_execSuffix');
|
|
Expect.isTrue(File(genSnapshot).existsSync(),
|
|
"Can't locate gen_snapshot$_execSuffix on this platform");
|
|
|
|
final exePath = path.join(buildDir, 'dart$_execSuffix');
|
|
Expect.isTrue(File(exePath).existsSync(),
|
|
"Can't locate dart$_execSuffix on this platform");
|
|
final powTest = path.join(sdkDir, 'tests', 'standalone', 'pow_test.dart');
|
|
Expect.isTrue(File(powTest).existsSync(),
|
|
"Can't locate dart$_execSuffix on this platform");
|
|
final d = Directory.systemTemp.createTempSync('aot_tmp');
|
|
final kernelOutput = File.fromUri(d.uri.resolve('pow_test.dill')).path;
|
|
final aotOutput = File.fromUri(d.uri.resolve('pow_test.aot')).path;
|
|
|
|
final genKernelResult = runAndPrintOutput(
|
|
genKernel,
|
|
[
|
|
'--aot',
|
|
'--platform=$platformDill',
|
|
'-o',
|
|
kernelOutput,
|
|
powTest,
|
|
],
|
|
);
|
|
Expect.equals(genKernelResult.exitCode, 0);
|
|
print("Ran successfully.\n");
|
|
|
|
final genAotResult = runAndPrintOutput(
|
|
genSnapshot,
|
|
[
|
|
'--snapshot_kind=app-aot-elf',
|
|
'--elf=$aotOutput',
|
|
kernelOutput,
|
|
],
|
|
);
|
|
Expect.equals(genAotResult.exitCode, 0);
|
|
print("Ran successfully.\n");
|
|
|
|
final runAotDirectlyResult = runAndPrintOutput(
|
|
exePath,
|
|
[
|
|
aotOutput,
|
|
],
|
|
);
|
|
Expect.equals(runAotDirectlyResult.exitCode, 255);
|
|
Expect.contains(
|
|
"pow_test.aot is an AOT snapshot and should be run with 'dartaotruntime'",
|
|
runAotDirectlyResult.stderr);
|
|
print('Got expected error result.');
|
|
|
|
final runAotUsingCommandResult = runAndPrintOutput(
|
|
exePath,
|
|
[
|
|
'run',
|
|
aotOutput,
|
|
],
|
|
);
|
|
Expect.equals(runAotUsingCommandResult.exitCode, 255);
|
|
Expect.containsOneOf(<String>[
|
|
"pow_test.aot is an AOT snapshot and should be run with 'dartaotruntime'",
|
|
// If dartdev itself failed, can happen on SIMARM as not enough is built
|
|
// to run it.
|
|
"Failed to start the Dart CLI isolate",
|
|
], runAotUsingCommandResult.stderr);
|
|
print('Got expected error result.');
|
|
}
|
|
|
|
ProcessResult runAndPrintOutput(String command, List<String> args) {
|
|
print('Running $command ${args.join(' ')}...');
|
|
final result = Process.runSync(command, args);
|
|
if (result.stdout.isNotEmpty) {
|
|
print("stdout: ");
|
|
print(result.stdout);
|
|
}
|
|
if (result.stderr.isNotEmpty) {
|
|
print("stderr: ");
|
|
print(result.stderr);
|
|
}
|
|
return result;
|
|
}
|