Skip to content

Commit

Permalink
[gardening] Run subprocesses in parallel to avoid timeout for vm/dart…
Browse files Browse the repository at this point in the history
…/analyze_snapshot_binary_test

We also mark the test as slow, since it does many subprocess runs.
This seems to fix debug-x64 runs of this test.

TEST=ci

Change-Id: I98f4ac5810e6241ec08dd523747325c8669560ef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237689
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
  • Loading branch information
mkustermann authored and Commit Bot committed Mar 21, 2022
1 parent e68cf05 commit 04f8303
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 18 deletions.
22 changes: 13 additions & 9 deletions runtime/tests/vm/dart/analyze_snapshot_binary_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,14 @@ main() async {
// extra information that needs stripping), so no need to specify
// stripUtil for useAsm tests.

// Test unstripped ELF generation directly.
await testAOT(aotDillPath);
await testAOT(aotDillPath, forceDrops: true);
await Future.wait([
// Test unstripped ELF generation directly.
testAOT(aotDillPath),
testAOT(aotDillPath, forceDrops: true),

// Test flag-stripped ELF generation.
await testAOT(aotDillPath, stripFlag: true);
// Test flag-stripped ELF generation.
testAOT(aotDillPath, stripFlag: true),
]);

// Since we can't force disassembler support after the fact when running
// in PRODUCT mode, skip any --disassemble tests. Do these tests last as
Expand Down Expand Up @@ -202,10 +204,12 @@ main() async {
printSkip('assembly tests');
return;
}
// Test unstripped assembly generation that is then externally stripped.
await testAOT(aotDillPath, useAsm: true);
// Test stripped assembly generation that is then externally stripped.
await testAOT(aotDillPath, useAsm: true, stripFlag: true);
await Future.wait([
// Test unstripped assembly generation that is then externally stripped.
testAOT(aotDillPath, useAsm: true),
// Test stripped assembly generation that is then externally stripped.
testAOT(aotDillPath, useAsm: true, stripFlag: true),
]);
});
}

Expand Down
22 changes: 13 additions & 9 deletions runtime/tests/vm/dart_2/analyze_snapshot_binary_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,14 @@ main() async {
// extra information that needs stripping), so no need to specify
// stripUtil for useAsm tests.

// Test unstripped ELF generation directly.
await testAOT(aotDillPath);
await testAOT(aotDillPath, forceDrops: true);
await Future.wait([
// Test unstripped ELF generation directly.
testAOT(aotDillPath),
testAOT(aotDillPath, forceDrops: true),

// Test flag-stripped ELF generation.
await testAOT(aotDillPath, stripFlag: true);
// Test flag-stripped ELF generation.
testAOT(aotDillPath, stripFlag: true),
]);

// Since we can't force disassembler support after the fact when running
// in PRODUCT mode, skip any --disassemble tests. Do these tests last as
Expand Down Expand Up @@ -200,10 +202,12 @@ main() async {
printSkip('assembly tests');
return;
}
// Test unstripped assembly generation that is then externally stripped.
await testAOT(aotDillPath, useAsm: true);
// Test stripped assembly generation that is then externally stripped.
await testAOT(aotDillPath, useAsm: true, stripFlag: true);
await Future.wait([
// Test unstripped assembly generation that is then externally stripped.
testAOT(aotDillPath, useAsm: true),
// Test stripped assembly generation that is then externally stripped.
testAOT(aotDillPath, useAsm: true, stripFlag: true),
]);
});
}

Expand Down
2 changes: 2 additions & 0 deletions runtime/tests/vm/vm.status
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ cc/IsolateReload_PendingStaticCall_DefinedToNSM: Fail # Issue 32981
cc/IsolateReload_PendingStaticCall_NSMToDefined: Fail, Crash # Issue 32981. Fails on non-Windows, crashes on Windows (because of test.py special handline)
cc/IsolateReload_PendingUnqualifiedCall_InstanceToStatic: Fail # Issue 32981
cc/IsolateReload_PendingUnqualifiedCall_StaticToInstance: Fail # Issue 32981
dart/analyze_snapshot_binary_test: Pass, Slow # Runs various subprocesses for testing AOT.
dart/boxmint_test: Pass, Slow # Uses slow path
dart/byte_array_optimized_test: Pass, Slow
dart/data_uri_import_test/none: SkipByDesign
Expand All @@ -25,6 +26,7 @@ dart/print_object_layout_test: Pass, Slow # Spawns several subprocesses
dart/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
dart/snapshot_version_test: Skip # This test is a Dart1 test (script snapshot)
dart/stack_overflow_shared_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
dart_2/analyze_snapshot_binary_test: Pass, Slow # Runs various subprocesses for testing AOT.
dart_2/boxmint_test: Pass, Slow # Uses slow path
dart_2/byte_array_optimized_test: Pass, Slow
dart_2/data_uri_import_test/none: SkipByDesign
Expand Down

0 comments on commit 04f8303

Please sign in to comment.