From 01b47c5427ec5318e9267128cee2083b70f32d1f Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Tue, 24 Jan 2023 15:29:44 -0800 Subject: [PATCH 1/2] Copy tests --- ... frontend_server_evaluate_sound_test.dart} | 0 .../frontend_server_evaluate_weak_test.dart | 61 +++++++++++++++++++ 2 files changed, 61 insertions(+) rename dwds/test/{frontend_server_evaluate_test.dart => frontend_server_evaluate_sound_test.dart} (100%) create mode 100644 dwds/test/frontend_server_evaluate_weak_test.dart diff --git a/dwds/test/frontend_server_evaluate_test.dart b/dwds/test/frontend_server_evaluate_sound_test.dart similarity index 100% rename from dwds/test/frontend_server_evaluate_test.dart rename to dwds/test/frontend_server_evaluate_sound_test.dart diff --git a/dwds/test/frontend_server_evaluate_weak_test.dart b/dwds/test/frontend_server_evaluate_weak_test.dart new file mode 100644 index 000000000..b489d2a07 --- /dev/null +++ b/dwds/test/frontend_server_evaluate_weak_test.dart @@ -0,0 +1,61 @@ +// 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. + +@TestOn('vm') +@Timeout(Duration(minutes: 2)) + +import 'dart:io'; + +import 'package:pub_semver/pub_semver.dart'; +import 'package:test/test.dart'; + +import 'fixtures/context.dart'; +import 'evaluate_common.dart'; +import 'utils/version_compatibility.dart'; + +void main() async { + // Enable verbose logging for debugging. + final debug = false; + + // TODO(annagrin): Remove when 2.19.0-150.0.dev is in stable. + final debuggerModuleNamesSupported = + Version.parse(Platform.version.split(' ').first) >= + Version.parse('2.19.0-150.0.dev'); + + for (var useDebuggerModuleNames in [false, true]) { + group('Debugger module names: $useDebuggerModuleNames |', () { + for (var nullSafety in NullSafety.values) { + group('${nullSafety.name} null safety |', () { + for (var indexBaseMode in IndexBaseMode.values) { + group( + 'with ${indexBaseMode.name} |', + () { + testAll( + compilationMode: CompilationMode.frontendServer, + indexBaseMode: indexBaseMode, + nullSafety: nullSafety, + useDebuggerModuleNames: useDebuggerModuleNames, + debug: debug, + ); + }, + skip: + // https://github.com/dart-lang/sdk/issues/49277 + (indexBaseMode == IndexBaseMode.base && Platform.isWindows) || + // https://github.com/dart-lang/webdev/issues/1591 + (nullSafety == NullSafety.sound) || + // Needs debugger module names feature in SDK. + (useDebuggerModuleNames && + !debuggerModuleNamesSupported) || + // TODO(https://github.com/dart-lang/webdev/issues/1818) Re-enable. + !supportedMode( + compilationMode: CompilationMode.frontendServer, + nullSafetyMode: nullSafety, + ), + ); + } + }); + } + }); + } +} From 3ec3f8887f4bd5b79a6874468b4ec20dc3239c36 Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Tue, 24 Jan 2023 15:46:46 -0800 Subject: [PATCH 2/2] Split frontend_server_evaluate tests to avoid timeouts --- .../frontend_server_evaluate_sound_test.dart | 44 ++++++--------- .../frontend_server_evaluate_weak_test.dart | 54 ++++++------------- 2 files changed, 32 insertions(+), 66 deletions(-) diff --git a/dwds/test/frontend_server_evaluate_sound_test.dart b/dwds/test/frontend_server_evaluate_sound_test.dart index 61d7d525f..a9c987b7a 100644 --- a/dwds/test/frontend_server_evaluate_sound_test.dart +++ b/dwds/test/frontend_server_evaluate_sound_test.dart @@ -7,7 +7,6 @@ import 'dart:io'; -import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; import 'fixtures/context.dart'; @@ -17,35 +16,24 @@ void main() async { // Enable verbose logging for debugging. final debug = false; - // TODO(annagrin): Remove when 2.19.0-150.0.dev is in stable. - final debuggerModuleNamesSupported = - Version.parse(Platform.version.split(' ').first) >= - Version.parse('2.19.0-150.0.dev'); - for (var useDebuggerModuleNames in [false, true]) { group('Debugger module names: $useDebuggerModuleNames |', () { - for (var nullSafety in NullSafety.values) { - group('${nullSafety.name} null safety |', () { - for (var indexBaseMode in IndexBaseMode.values) { - group('with ${indexBaseMode.name} |', () { - testAll( - compilationMode: CompilationMode.frontendServer, - indexBaseMode: indexBaseMode, - nullSafety: nullSafety, - useDebuggerModuleNames: useDebuggerModuleNames, - debug: debug, - ); - }, - skip: - // https://github.com/dart-lang/sdk/issues/49277 - (indexBaseMode == IndexBaseMode.base && - Platform.isWindows) || - // Needs debugger module names feature in SDK. - (useDebuggerModuleNames && - !debuggerModuleNamesSupported)); - } - }); - } + final nullSafety = NullSafety.sound; + group('${nullSafety.name} null safety |', () { + for (var indexBaseMode in IndexBaseMode.values) { + group('with ${indexBaseMode.name} |', () { + testAll( + compilationMode: CompilationMode.frontendServer, + indexBaseMode: indexBaseMode, + nullSafety: nullSafety, + useDebuggerModuleNames: useDebuggerModuleNames, + debug: debug, + ); + }, + // https://github.com/dart-lang/sdk/issues/49277 + skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows); + } + }); }); } } diff --git a/dwds/test/frontend_server_evaluate_weak_test.dart b/dwds/test/frontend_server_evaluate_weak_test.dart index b489d2a07..b26000e01 100644 --- a/dwds/test/frontend_server_evaluate_weak_test.dart +++ b/dwds/test/frontend_server_evaluate_weak_test.dart @@ -3,59 +3,37 @@ // BSD-style license that can be found in the LICENSE file. @TestOn('vm') -@Timeout(Duration(minutes: 2)) +@Timeout(Duration(minutes: 5)) import 'dart:io'; -import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; import 'fixtures/context.dart'; import 'evaluate_common.dart'; -import 'utils/version_compatibility.dart'; void main() async { // Enable verbose logging for debugging. final debug = false; - // TODO(annagrin): Remove when 2.19.0-150.0.dev is in stable. - final debuggerModuleNamesSupported = - Version.parse(Platform.version.split(' ').first) >= - Version.parse('2.19.0-150.0.dev'); - for (var useDebuggerModuleNames in [false, true]) { group('Debugger module names: $useDebuggerModuleNames |', () { - for (var nullSafety in NullSafety.values) { - group('${nullSafety.name} null safety |', () { - for (var indexBaseMode in IndexBaseMode.values) { - group( - 'with ${indexBaseMode.name} |', - () { - testAll( - compilationMode: CompilationMode.frontendServer, - indexBaseMode: indexBaseMode, - nullSafety: nullSafety, - useDebuggerModuleNames: useDebuggerModuleNames, - debug: debug, - ); - }, - skip: - // https://github.com/dart-lang/sdk/issues/49277 - (indexBaseMode == IndexBaseMode.base && Platform.isWindows) || - // https://github.com/dart-lang/webdev/issues/1591 - (nullSafety == NullSafety.sound) || - // Needs debugger module names feature in SDK. - (useDebuggerModuleNames && - !debuggerModuleNamesSupported) || - // TODO(https://github.com/dart-lang/webdev/issues/1818) Re-enable. - !supportedMode( - compilationMode: CompilationMode.frontendServer, - nullSafetyMode: nullSafety, - ), + final nullSafety = NullSafety.weak; + group('${nullSafety.name} null safety |', () { + for (var indexBaseMode in IndexBaseMode.values) { + group('with ${indexBaseMode.name} |', () { + testAll( + compilationMode: CompilationMode.frontendServer, + indexBaseMode: indexBaseMode, + nullSafety: nullSafety, + useDebuggerModuleNames: useDebuggerModuleNames, + debug: debug, ); - } - }); - } + }, + // https://github.com/dart-lang/sdk/issues/49277 + skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows); + } + }); }); } }