OLD | NEW |
---|---|
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 import 'dart:io'; | 5 import 'dart:io'; |
6 | 6 |
7 import 'package:boolean_selector/boolean_selector.dart'; | 7 import 'package:boolean_selector/boolean_selector.dart'; |
8 import 'package:collection/collection.dart'; | 8 import 'package:collection/collection.dart'; |
9 import 'package:glob/glob.dart'; | 9 import 'package:glob/glob.dart'; |
10 import 'package:path/path.dart' as p; | 10 import 'package:path/path.dart' as p; |
11 | 11 |
12 import '../backend/metadata.dart'; | 12 import '../backend/metadata.dart'; |
13 import '../backend/operating_system.dart'; | |
kevmoo
2016/03/01 06:01:12
Unneeded import...
nweiz
2016/03/01 19:24:49
Done.
| |
13 import '../backend/platform_selector.dart'; | 14 import '../backend/platform_selector.dart'; |
14 import '../backend/test_platform.dart'; | 15 import '../backend/test_platform.dart'; |
15 import '../frontend/timeout.dart'; | 16 import '../frontend/timeout.dart'; |
16 import '../util/io.dart'; | 17 import '../util/io.dart'; |
17 import '../utils.dart'; | 18 import '../utils.dart'; |
18 import 'configuration/args.dart' as args; | 19 import 'configuration/args.dart' as args; |
19 import 'configuration/load.dart'; | 20 import 'configuration/load.dart'; |
20 import 'configuration/values.dart'; | 21 import 'configuration/values.dart'; |
21 | 22 |
22 /// A class that encapsulates the command-line configuration of the test runner. | 23 /// A class that encapsulates the command-line configuration of the test runner. |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
273 filename: other._filename ?? _filename, | 274 filename: other._filename ?? _filename, |
274 includeTags: includeTags.intersection(other.includeTags), | 275 includeTags: includeTags.intersection(other.includeTags), |
275 excludeTags: excludeTags.union(other.excludeTags), | 276 excludeTags: excludeTags.union(other.excludeTags), |
276 addTags: other.addTags.union(addTags), | 277 addTags: other.addTags.union(addTags), |
277 tags: mergeMaps(tags, other.tags, | 278 tags: mergeMaps(tags, other.tags, |
278 value: (config1, config2) => config1.merge(config2)), | 279 value: (config1, config2) => config1.merge(config2)), |
279 onPlatform: mergeMaps(onPlatform, other.onPlatform, | 280 onPlatform: mergeMaps(onPlatform, other.onPlatform, |
280 value: (config1, config2) => config1.merge(config2))); | 281 value: (config1, config2) => config1.merge(config2))); |
281 } | 282 } |
282 } | 283 } |
OLD | NEW |