firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] dont use SETLOCAL ENABLEDELAYEDEXPANSION unecessarily (#85288)

Browse Source
This commit is contained in:
Jonah Williams 2021-06-24 22:21:01 -07:00 committed by GitHub
parent d7d11c5263
commit f04508a426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/dart.bat
View File

@ -11,8 +11,6 @@ REM work across all platforms!
REM REM
REM -------------------------------------------------------------------------- REM --------------------------------------------------------------------------
SETLOCAL ENABLEDELAYEDEXPANSION
FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi
REM Include shared scripts in shared.bat REM Include shared scripts in shared.bat

2
bin/flutter.bat
View File

@ -11,8 +11,6 @@ REM work across all platforms!
REM REM
REM -------------------------------------------------------------------------- REM --------------------------------------------------------------------------
SETLOCAL ENABLEDELAYEDEXPANSION
FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi
REM If available, add location of bundled mingit to PATH REM If available, add location of bundled mingit to PATH

8
packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart Normal file
View File

@ -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
packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart Normal file
View File

@ -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).+"',
]);
expect(result.stdout, contains('args: ["(?!Golden).+"]'));
}, skip: !platform.isWindows);
}