Skip to content

Commit d22e3df

Browse files
authored
Fix test package exclude (#2528)
* initial fix * dartfmt
1 parent 951bfc2 commit d22e3df

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

testing/test_package/analysis_options.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

tool/grind.dart

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ Future<String> createComparisonDartdoc() async {
435435
/// to be a git repository), configured to use packages from the Dart SDK.
436436
///
437437
/// This copy of dartdoc depends on the HEAD versions of various packages
438-
/// developed within the SDK, such as 'analyzer' and '_fe_analyzer_shared'.
439-
/// 'meta' is overridden if [overrideMeta] is true.
440-
Future<String> createSdkDartdoc(bool overrideMeta) async {
438+
/// developed within the SDK, such as 'analyzer', '_fe_analyzer_shared',
439+
/// and 'meta'.
440+
Future<String> createSdkDartdoc() async {
441441
var launcher = SubprocessLauncher('create-sdk-dartdoc');
442442
var dartdocSdk = Directory.systemTemp.createTempSync('dartdoc-sdk');
443443
await launcher
@@ -470,24 +470,13 @@ Future<String> createSdkDartdoc(bool overrideMeta) async {
470470
dartdocPubspec.writeAsStringSync('''
471471
472472
dependency_overrides:
473-
args: ^2.0.0-nullsafety.0
474-
cli_util: ^0.3.0-nullsafety.0
475-
crypto: ^3.0.0-nullsafety.0
476-
glob: ^2.0.0-nullsafety.0
477-
package_config: ^2.0.0-nullsafety.0
478-
pub_semver: ^2.0.0-nullsafety.0
479-
yaml: ^3.0.0-nullsafety.0
480473
analyzer:
481474
path: '${sdkClone.path}/pkg/analyzer'
482475
_fe_analyzer_shared:
483476
path: '${sdkClone.path}/pkg/_fe_analyzer_shared'
484-
''', mode: FileMode.append);
485-
if (overrideMeta) {
486-
dartdocPubspec.writeAsStringSync('''
487477
meta:
488478
path: '${sdkClone.path}/pkg/meta'
489479
''', mode: FileMode.append);
490-
}
491480
await launcher.runStreamed(sdkBin('pub'), ['get'],
492481
workingDirectory: dartdocSdk.path);
493482
return dartdocSdk.path;
@@ -497,8 +486,7 @@ dependency_overrides:
497486
Future<void> testWithAnalyzerSdk() async {
498487
var launcher = SubprocessLauncher('test-with-analyzer-sdk');
499488
// Do not override meta on branches outside of stable.
500-
var sdkDartdoc =
501-
await createSdkDartdoc(RegExp('[.]\w+').hasMatch(Platform.version));
489+
var sdkDartdoc = await createSdkDartdoc();
502490
var defaultGrindParameter =
503491
Platform.environment['DARTDOC_GRIND_STEP'] ?? 'test';
504492
await launcher.runStreamed(

0 commit comments

Comments
 (0)