diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 93ac2038e3..f54803e081 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -1028,13 +1028,13 @@ Future _runWebIntegrationTests() async { await _runWebDebugTest('lib/null_safe_main.dart', enableNullSafety: true); await _runWebDebugTest('lib/web_define_loading.dart', additionalArguments: [ - '--dart-define=test.valueA=Example', + '--dart-define=test.valueA=Example,A', '--dart-define=test.valueB=Value', ] ); await _runWebReleaseTest('lib/web_define_loading.dart', additionalArguments: [ - '--dart-define=test.valueA=Example', + '--dart-define=test.valueA=Example,A', '--dart-define=test.valueB=Value', ] ); diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index 30a5b4c964..528118be08 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -131,7 +131,7 @@ TaskFunction dartDefinesTask() { return DriverTest( '${flutterDirectory.path}/dev/integration_tests/ui', 'lib/defines.dart', extraOptions: [ - '--dart-define=test.valueA=Example', + '--dart-define=test.valueA=Example,A', '--dart-define=test.valueB=Value', ], ); diff --git a/dev/integration_tests/ui/test_driver/defines_test.dart b/dev/integration_tests/ui/test_driver/defines_test.dart index af049ec746..a4b5318292 100644 --- a/dev/integration_tests/ui/test_driver/defines_test.dart +++ b/dev/integration_tests/ui/test_driver/defines_test.dart @@ -17,6 +17,6 @@ void main() { }); test('Can run with --dart-define', () async { - await driver.waitFor(find.text('ExampleValue')); + await driver.waitFor(find.text('Example,AValue')); }); } diff --git a/dev/integration_tests/web/lib/web_define_loading.dart b/dev/integration_tests/web/lib/web_define_loading.dart index 32f771d4b2..742afbb560 100644 --- a/dev/integration_tests/web/lib/web_define_loading.dart +++ b/dev/integration_tests/web/lib/web_define_loading.dart @@ -8,7 +8,7 @@ Future main() async { final StringBuffer output = StringBuffer(); const String combined = String.fromEnvironment('test.valueA') + String.fromEnvironment('test.valueB'); - if (combined == 'ExampleValue') { + if (combined == 'Example,AValue') { output.write('--- TEST SUCCEEDED ---'); print('--- TEST SUCCEEDED ---'); } else { diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index b9adae8710..1d926b3512 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -476,6 +476,7 @@ abstract class FlutterCommand extends Command { 'and double.fromEnvironment constructors.\n' 'Multiple defines can be passed by repeating --dart-define multiple times.', valueHelp: 'foo=bar', + splitCommas: false, ); }