github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] ensure --dart-define can parse args with commas (#73798)

Browse Source
This commit is contained in:
Jonah Williams 2021-01-15 13:51:32 -08:00 committed by GitHub
parent b2f99e5677
commit 7ee910b0a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/bots/test.dart
View File

@ -1028,13 +1028,13 @@ Future<void> _runWebIntegrationTests() async {
await _runWebDebugTest('lib/null_safe_main.dart', enableNullSafety: true); await _runWebDebugTest('lib/null_safe_main.dart', enableNullSafety: true);
await _runWebDebugTest('lib/web_define_loading.dart', await _runWebDebugTest('lib/web_define_loading.dart',
additionalArguments: <String>[ additionalArguments: <String>[
'--dart-define=test.valueA=Example', '--dart-define=test.valueA=Example,A',
'--dart-define=test.valueB=Value', '--dart-define=test.valueB=Value',
] ]
); );
await _runWebReleaseTest('lib/web_define_loading.dart', await _runWebReleaseTest('lib/web_define_loading.dart',
additionalArguments: <String>[ additionalArguments: <String>[
'--dart-define=test.valueA=Example', '--dart-define=test.valueA=Example,A',
'--dart-define=test.valueB=Value', '--dart-define=test.valueB=Value',
] ]
); );

2
dev/devicelab/lib/tasks/integration_tests.dart
View File

@ -131,7 +131,7 @@ TaskFunction dartDefinesTask() {
return DriverTest( return DriverTest(
'${flutterDirectory.path}/dev/integration_tests/ui', '${flutterDirectory.path}/dev/integration_tests/ui',
'lib/defines.dart', extraOptions: <String>[ 'lib/defines.dart', extraOptions: <String>[
'--dart-define=test.valueA=Example', '--dart-define=test.valueA=Example,A',
'--dart-define=test.valueB=Value', '--dart-define=test.valueB=Value',
], ],
); );

2
dev/integration_tests/ui/test_driver/defines_test.dart
View File

@ -17,6 +17,6 @@ void main() {
}); });
test('Can run with --dart-define', () async { test('Can run with --dart-define', () async {
await driver.waitFor(find.text('ExampleValue')); await driver.waitFor(find.text('Example,AValue'));
}); });
} }

2
dev/integration_tests/web/lib/web_define_loading.dart
View File

@ -8,7 +8,7 @@ Future<void> main() async {
final StringBuffer output = StringBuffer(); final StringBuffer output = StringBuffer();
const String combined = String.fromEnvironment('test.valueA') + const String combined = String.fromEnvironment('test.valueA') +
String.fromEnvironment('test.valueB'); String.fromEnvironment('test.valueB');
if (combined == 'ExampleValue') { if (combined == 'Example,AValue') {
output.write('--- TEST SUCCEEDED ---'); output.write('--- TEST SUCCEEDED ---');
print('--- TEST SUCCEEDED ---'); print('--- TEST SUCCEEDED ---');
} else { } else {

1
packages/flutter_tools/lib/src/runner/flutter_command.dart
View File

@ -476,6 +476,7 @@ abstract class FlutterCommand extends Command<void> {
'and double.fromEnvironment constructors.\n' 'and double.fromEnvironment constructors.\n'
'Multiple defines can be passed by repeating --dart-define multiple times.', 'Multiple defines can be passed by repeating --dart-define multiple times.',
valueHelp: 'foo=bar', valueHelp: 'foo=bar',
splitCommas: false,
); );
} }