[VM / Tests] Add the --verbosity option to the test invocations
Add the verbosity option to the test invocations to suppress the info
messages and make regular runs behave like the AOT/App JIT runs
Fixes : https://github.com/dart-lang/sdk/issues/44744
TEST=Updating tests
Change-Id: Ia0415f584a6d69785cde2e5d59849aaf8f9578a9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/181302
Reviewed-by: Ben Konyi <bkonyi@google.com>
Commit-Queue: Siva Annamalai <asiva@google.com>
diff --git a/runtime/tests/vm/dart/sdk_hash_test.dart b/runtime/tests/vm/dart/sdk_hash_test.dart
index 0ad4dba..a795208 100644
--- a/runtime/tests/vm/dart/sdk_hash_test.dart
+++ b/runtime/tests/vm/dart/sdk_hash_test.dart
@@ -31,11 +31,12 @@
final result = await Process.run(dart, [
'--snapshot-kind=kernel',
'--snapshot=$dillPath',
+ '--verbosity=warning',
sourcePath,
]);
Expect.equals('', result.stderr);
Expect.equals(0, result.exitCode);
- Expect.equals('$unsoundNullSafetyMessage\n', result.stdout);
+ Expect.equals('', result.stdout);
}
{
diff --git a/runtime/tests/vm/dart/snapshot_test_helper.dart b/runtime/tests/vm/dart/snapshot_test_helper.dart
index 28e5c47..80dcb77 100644
--- a/runtime/tests/vm/dart/snapshot_test_helper.dart
+++ b/runtime/tests/vm/dart/snapshot_test_helper.dart
@@ -130,12 +130,6 @@
final snapshot1Path = p.join(temp, 'snapshot1');
final snapshot2Path = p.join(temp, 'snapshot2');
- if (expectedStdout.isEmpty) {
- expectedStdout = nullSafetyMessage;
- } else {
- expectedStdout = '$nullSafetyMessage\n$expectedStdout';
- }
-
print("Version ${Platform.version}");
final generate1Result = await runDart('GENERATE SNAPSHOT 1', [
@@ -144,6 +138,7 @@
'--trace_type_finalization',
'--trace_compiler',
'--verbose_gc',
+ '--verbosity=warning',
'--snapshot=$snapshot1Path',
'--snapshot-kind=$snapshotKind',
Platform.script.toFilePath(),
@@ -157,6 +152,7 @@
'--trace_type_finalization',
'--trace_compiler',
'--verbose_gc',
+ '--verbosity=warning',
'--snapshot=$snapshot2Path',
'--snapshot-kind=$snapshotKind',
Platform.script.toFilePath(),
@@ -189,18 +185,12 @@
final trainingResult = await runDart('TRAINING RUN', [
'--snapshot=$snapshotPath',
'--snapshot-kind=app-jit',
+ '--verbosity=warning',
testPath,
'--train'
]);
- expectOutput("$nullSafetyMessage\nOK(Trained)", trainingResult);
+ expectOutput("OK(Trained)", trainingResult);
final runResult = await runSnapshot!(snapshotPath);
expectOutput("OK(Run)", runResult);
});
}
-
-final String nullSafetyMessage =
- hasSoundNullSafety ? soundNullSafetyMessage : unsoundNullSafetyMessage;
-
-const String soundNullSafetyMessage = 'Info: Compiling with sound null safety';
-const String unsoundNullSafetyMessage =
- 'Info: Compiling without sound null safety';
diff --git a/runtime/tests/vm/dart_2/sdk_hash_test.dart b/runtime/tests/vm/dart_2/sdk_hash_test.dart
index 40f245d..5030445 100644
--- a/runtime/tests/vm/dart_2/sdk_hash_test.dart
+++ b/runtime/tests/vm/dart_2/sdk_hash_test.dart
@@ -29,13 +29,14 @@
{
final result = await Process.run(dart, [
+ '--verbosity=warning',
'--snapshot-kind=kernel',
'--snapshot=$dillPath',
sourcePath,
]);
Expect.equals('', result.stderr);
Expect.equals(0, result.exitCode);
- Expect.equals('$unsoundNullSafetyMessage\n', result.stdout);
+ Expect.equals('', result.stdout);
}
{
diff --git a/runtime/tests/vm/dart_2/snapshot_test_helper.dart b/runtime/tests/vm/dart_2/snapshot_test_helper.dart
index ae68005..de92dad 100644
--- a/runtime/tests/vm/dart_2/snapshot_test_helper.dart
+++ b/runtime/tests/vm/dart_2/snapshot_test_helper.dart
@@ -130,12 +130,6 @@
final snapshot1Path = p.join(temp, 'snapshot1');
final snapshot2Path = p.join(temp, 'snapshot2');
- if (expectedStdout.isEmpty) {
- expectedStdout = unsoundNullSafetyMessage;
- } else {
- expectedStdout = '$unsoundNullSafetyMessage\n$expectedStdout';
- }
-
print("Version ${Platform.version}");
final generate1Result = await runDart('GENERATE SNAPSHOT 1', [
@@ -144,6 +138,7 @@
'--trace_type_finalization',
'--trace_compiler',
'--verbose_gc',
+ '--verbosity=warning',
'--snapshot=$snapshot1Path',
'--snapshot-kind=$snapshotKind',
Platform.script.toFilePath(),
@@ -157,6 +152,7 @@
'--trace_type_finalization',
'--trace_compiler',
'--verbose_gc',
+ '--verbosity=warning',
'--snapshot=$snapshot2Path',
'--snapshot-kind=$snapshotKind',
Platform.script.toFilePath(),
@@ -189,14 +185,12 @@
final trainingResult = await runDart('TRAINING RUN', [
'--snapshot=$snapshotPath',
'--snapshot-kind=app-jit',
+ '--verbosity=warning',
testPath,
'--train'
]);
- expectOutput("$unsoundNullSafetyMessage\nOK(Trained)", trainingResult);
+ expectOutput("OK(Trained)", trainingResult);
final runResult = await runSnapshot(snapshotPath);
expectOutput("OK(Run)", runResult);
});
}
-
-const String unsoundNullSafetyMessage =
- 'Info: Compiling without sound null safety';
