From 9bd89a769d596705ee580c8e1a9e42167a47bf98 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 27 May 2026 13:49:54 -0700 Subject: [PATCH] Work around issue with -r in presubmit scripts. For some reason, when a `CheckSorted` presubmit invokes `verify_sorted_test.dart`, the `-r` flag is preventing the compiler from picking up the proper language version from `.dart_tool/package_config.json`. This is interfering with my ability to run presubmits for https://dart-review.googlesource.com/c/sdk/+/505046. See https://github.com/dart-lang/sdk/issues/63464 for additional details. As a temporary workaround, this CL removes the `-r` flag. It should be reverted once https://github.com/dart-lang/sdk/issues/63464 has been fixed (and the pre-built SDK has been updated to include the fix). Change-Id: Ibc48eec4ef382d6afe17d73454f07dcd6a6a6964 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/506700 Commit-Queue: Paul Berry Reviewed-by: Samuel Rawlins Reviewed-by: Konstantin Shcheglov --- pkg/analysis_server/PRESUBMIT.py | 1 - pkg/analyzer_cli/PRESUBMIT.py | 1 - pkg/analyzer_plugin/PRESUBMIT.py | 1 - pkg/linter/PRESUBMIT.py | 1 - 4 files changed, 4 deletions(-) diff --git a/pkg/analysis_server/PRESUBMIT.py b/pkg/analysis_server/PRESUBMIT.py index d4d347004f9..8fb5f022041 100644 --- a/pkg/analysis_server/PRESUBMIT.py +++ b/pkg/analysis_server/PRESUBMIT.py @@ -44,7 +44,6 @@ def CheckSorted(input_api, output_api): result = subprocess.run([ dart, 'run', - '-r', os.path.join(local_root, 'pkg', 'analysis_server', 'test', 'verify_sorted_test.dart'), ] + sourceArgs, diff --git a/pkg/analyzer_cli/PRESUBMIT.py b/pkg/analyzer_cli/PRESUBMIT.py index d4d347004f9..8fb5f022041 100644 --- a/pkg/analyzer_cli/PRESUBMIT.py +++ b/pkg/analyzer_cli/PRESUBMIT.py @@ -44,7 +44,6 @@ def CheckSorted(input_api, output_api): result = subprocess.run([ dart, 'run', - '-r', os.path.join(local_root, 'pkg', 'analysis_server', 'test', 'verify_sorted_test.dart'), ] + sourceArgs, diff --git a/pkg/analyzer_plugin/PRESUBMIT.py b/pkg/analyzer_plugin/PRESUBMIT.py index d4d347004f9..8fb5f022041 100644 --- a/pkg/analyzer_plugin/PRESUBMIT.py +++ b/pkg/analyzer_plugin/PRESUBMIT.py @@ -44,7 +44,6 @@ def CheckSorted(input_api, output_api): result = subprocess.run([ dart, 'run', - '-r', os.path.join(local_root, 'pkg', 'analysis_server', 'test', 'verify_sorted_test.dart'), ] + sourceArgs, diff --git a/pkg/linter/PRESUBMIT.py b/pkg/linter/PRESUBMIT.py index d4d347004f9..8fb5f022041 100644 --- a/pkg/linter/PRESUBMIT.py +++ b/pkg/linter/PRESUBMIT.py @@ -44,7 +44,6 @@ def CheckSorted(input_api, output_api): result = subprocess.run([ dart, 'run', - '-r', os.path.join(local_root, 'pkg', 'analysis_server', 'test', 'verify_sorted_test.dart'), ] + sourceArgs,