From e1db01e2dd64ed41a0c63f086b05c48a5feeff31 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Thu, 24 Jun 2021 21:16:18 -0700 Subject: [PATCH] [flutter_tools] dont use SETLOCAL ENABLEDELAYEDEXPANSION unecessarily --- bin/dart.bat | 2 -- bin/flutter.bat | 2 -- .../variable_expansion_windows.dart | 8 +++++++ .../variable_expansion_windows_test.dart | 21 +++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart create mode 100644 packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart diff --git a/bin/dart.bat b/bin/dart.bat index 96f8599b93c74..c4b71d292302d 100644 --- a/bin/dart.bat +++ b/bin/dart.bat @@ -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 diff --git a/bin/flutter.bat b/bin/flutter.bat index 7c3ba962d6365..f80321d9d526a 100644 --- a/bin/flutter.bat +++ b/bin/flutter.bat @@ -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 diff --git a/packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart b/packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart new file mode 100644 index 0000000000000..179d7429038b7 --- /dev/null +++ b/packages/flutter_tools/test/integration.shard/variable_expansion_windows.dart @@ -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 args) { + print('args: $args'); +} diff --git a/packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart b/packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart new file mode 100644 index 0000000000000..192a9adf37e5d --- /dev/null +++ b/packages/flutter_tools/test/integration.shard/variable_expansion_windows_test.dart @@ -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([ + 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); +}