commit 6fff4de306775580d5000e018dd1053baac657ab
author Jens Johansen <jensj@google.com> Thu Mar 25 10:25:33 2021 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Mar 25 10:25:33 2021 +0000
tree 1d92ad7a55e13790d244aa49e62e6fbad2eaea3b
parent a7456570500d6497cbbbd04a1fe8da27ac3e4499

[CFE] Properly clean-up expectations wrt optional phases for strong/weak tests

Before this CL we could for instance get this result:

```
$ out/ReleaseX64/dart --enable-asserts pkg/front_end/test/fasta/weak_suite.dart -DsemiFuzz=false -DskipVm=true -- weak/general/error_recovery/issue_39058.crash

[...]
1 failed:
weak/general/error_recovery/issue_39058.crash: Pass
```

The reason is, that before it onle rewrote the expectations if there was
exactly one expectation.
`weak/general/error_recovery/issue_39058.crash` for instance (currently)
has two expecations: RuntimeError and SemiFuzzFailure.

All combinations of `-DsemiFuz` and `-DskipVm=true` would thus keep both
of those expectations.

For the combination `-DsemiFuzz=false -DskipVm=true` it actually passes,
though, which doesn't match so it fails saying that the expectations
should be updated.

For any of the other expectations it would be fine because it would get
one of the expected outcomes:
* `-DsemiFuzz=true -DskipVm=true`: Fuzzing is enabled so it would get a
  SemiFuzzFailure which matches one of the expectations.
* `-DsemiFuzz=true -DskipVm=false`: Fuzzing is enabled so it would get a
  SemiFuzzFailure which matches one of the expectations.
* `-DsemiFuzz=false -DskipVm=false`): It doesn't skip the VM so it gets
  a RuntimeError which matches one of the expectations.

This CL fixes the issue by removing the "wrong" expectation(s), leaving
the correct one(s) and adding 'pass' of all other expectation(s) have
been removed.

Change-Id: I8137d16fdfeb322cb76d6af97cafc279222ae205
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/192921
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>