Skip to content

[flutter_tools] dont use SETLOCAL ENABLEDELAYEDEXPANSION unnecessarily #85288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fluttergithubbot merged 1 commit into from
Jun 25, 2021
Merged

[flutter_tools] dont use SETLOCAL ENABLEDELAYEDEXPANSION unnecessarily #85288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bin/dart.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ REM work across all platforms!
REM
REM --------------------------------------------------------------------------

SETLOCAL ENABLEDELAYEDEXPANSION

FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi

REM Include shared scripts in shared.bat
Expand Down
2 changes: 0 additions & 2 deletions bin/flutter.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ REM work across all platforms!
REM
REM --------------------------------------------------------------------------

SETLOCAL ENABLEDELAYEDEXPANSION

FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi

REM If available, add location of bundled mingit to PATH
Expand Down
8 changes: 8 additions & 0 deletions packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Not a test file, invoked by `variable_expansion_windows_test.dart`.
void main(List<String> args) {
print('args: $args');
}
21 changes: 21 additions & 0 deletions packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.8
import 'package:flutter_tools/src/base/io.dart';

import '../src/common.dart';
import 'test_utils.dart';

void main() {
// Regression test for https://github.com/flutter/flutter/issues/84270 .
testWithoutContext('dart command will expand variables on windows', () async {
final ProcessResult result = await processManager.run(<String>[
fileSystem.path.join(getFlutterRoot(), 'bin', 'dart'),
fileSystem.path.join(getFlutterRoot(), 'packages', 'flutter_tools', 'test', 'integration.shard', 'variable_expansion_windows.dart'),
'"^(?!Golden).+"',

@jonahwilliams jonahwilliams Jun 25, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With SETLOCAL ENABLEDELAYEDEXPANSION the quotes are missing

]);
expect(result.stdout, contains('args: ["(?!Golden).+"]'));
}, skip: !platform.isWindows);
}