Skip to content

Commit 6f677df

Browse files
liamappelbeCommit Queue
authored andcommitted
[test] Disable regress_53519_test in obfuscated/dwarf mode
Also reverts https://dart-review.googlesource.com/c/sdk/+/354840, which attempted the same thing. The vmOptions are not parsed correctly on the bots. Fixes: https://github.com/dart-lang/sdk/issues/550599 Change-Id: I05c7184ffb6d303309714a667d209d3621dcc348 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355960 Commit-Queue: Liam Appelbe <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent c380558 commit 6f677df

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

pkg/expect/lib/config.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ bool get isVmJitConfiguration => _configuration.compiler == Compiler.dartk;
3131

3232
bool get isVmAotConfiguration => _configuration.compiler == Compiler.dartkp;
3333

34-
bool get isVmDwarfConfiguration =>
35-
_configuration.vmOptions.contains('--dwarf_stack_traces');
36-
37-
bool get isVmObfuscateConfiguration =>
38-
_configuration.vmOptions.contains('--obfuscate');
39-
4034
bool get isVmConfiguration => isVmJitConfiguration || isVmAotConfiguration;
4135

4236
bool get isWebConfiguration =>

tests/standalone/regress_53519_test.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@
66
// Regression test for https://github.com/dart-lang/sdk/issues/53519
77

88
import 'package:expect/expect.dart';
9-
import 'package:expect/config.dart';
109

1110
String destructure(Map<String, dynamic> map) {
1211
final {'hello': world, 'count': count} = map;
1312
return 'Hello $world, count: $count';
1413
}
1514

1615
main() {
17-
// Stringification of stack traces is only valid in non-obfuscated & non-dwarf
18-
// mode.
19-
if (isVmObfuscateConfiguration || isVmDwarfConfiguration) return;
20-
2116
try {
2217
destructure({
2318
'hello': 'world',
@@ -26,7 +21,7 @@ main() {
2621
} catch (e, s) {
2722
print(s);
2823
// Expect that the stack trace contains an entry for the destructure
29-
// function at line 12.
30-
Expect.isTrue(s.toString().contains(RegExp(r'destructure \(.*:12(:3)?\)')));
24+
// function at line 11.
25+
Expect.isTrue(s.toString().contains(RegExp(r'destructure \(.*:11(:3)?\)')));
3126
}
3227
}

tests/standalone/standalone.status

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package/scenarios/invalid/non_existent_packages_file_test: CompileTimeError
1616

1717
[ $builder_tag == dwarf ]
1818
io/socket_connect_stacktrace_test: SkipByDesign # Assumes stacktrace can be inspected directly, without decoding
19+
regress_53519_test.dart: SkipByDesign # Relies on symbolic stack traces.
1920
stack_trace/full1_test: SkipByDesign # Relies on symbolic stack traces.
2021
stack_trace/full2_test: SkipByDesign # Relies on symbolic stack traces.
2122
stack_trace/full3_test: SkipByDesign # Relies on symbolic stack traces.
@@ -38,6 +39,7 @@ io/socket_source_address_test: SkipByDesign
3839

3940
[ $builder_tag == obfuscated ]
4041
no_such_method_error_with_invocation_test: SkipByDesign # Checks the member names in the NSM error message.
42+
regress_53519_test.dart: SkipByDesign # Relies on symbolic stack traces.
4143

4244
[ $compiler == app_jitk ]
4345
io/socket_sigpipe_test: SkipByDesign # Spawns server process using Platform.executable

0 commit comments

Comments
 (0)