Add new test configuration fields.

lib/src/runner/configuration.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
 
 import 'package:boolean_selector/boolean_selector.dart';
 import 'package:collection/collection.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart' as p;
 
 import '../backend/metadata.dart';
+import '../backend/platform_selector.dart';
 import '../backend/test_platform.dart';
 import '../frontend/timeout.dart';
 import '../util/io.dart';
 import '../utils.dart';
 import 'configuration/args.dart' as args;
 import 'configuration/load.dart';
 import 'configuration/values.dart';
 
 /// A class that encapsulates the command-line configuration of the test runner.
 class Configuration {
@@ skipping 11 matching lines @@
   /// Whether stack traces should be presented as-is or folded to remove
   /// irrelevant packages.
   bool get verboseTrace => _verboseTrace ?? false;
   final bool _verboseTrace;
 
   /// Whether JavaScript stack traces should be left as-is or converted to
   /// Dart-like traces.
   bool get jsTrace => _jsTrace ?? false;
   final bool _jsTrace;
 
+  /// Whether tests should be skipped.
+  bool get skip => _skip ?? false;
+  final bool _skip;
+
+  /// The reason tests or suites should be skipped, if given.
+  final String skipReason;
+
+  /// The selector indicating which platforms the tests support.
+  ///
+  /// When [merge]d, this is intersected with the other configuration's
+  /// supported platforms.
+  final PlatformSelector testOn;
+
   /// Whether to pause for debugging after loading each test suite.
   bool get pauseAfterLoad => _pauseAfterLoad ?? false;
   final bool _pauseAfterLoad;
 
   /// The package root for resolving "package:" URLs.
   String get packageRoot => _packageRoot ?? p.join(p.current, 'packages');
   final String _packageRoot;
 
   /// The name of the reporter to use to display results.
   String get reporter => _reporter ?? defaultReporter;
@@ skipping 60 matching lines @@
 
   /// Tags that are added to the tests.
   ///
   /// This is usually only used for scoped configuration.
   final Set<String> addTags;
 
   /// The global test metadata derived from this configuration.
   Metadata get metadata => new Metadata(
       timeout: timeout,
       verboseTrace: verboseTrace,
+      skip: skip,
+      skipReason: skipReason,
+      testOn: testOn,
       tags: addTags,
       forTag: mapMap(tags, value: (_, config) => config.metadata));
 
   /// The set of tags that have been declaredin any way in this configuration.
   Set<String> get knownTags {
     if (_knownTags != null) return _knownTags;
 
     var known = includeTags.variables.toSet()
       ..addAll(excludeTags.variables)
       ..addAll(addTags);
@@ skipping 11 matching lines @@
   ///
   /// Throws a [FormatException] if [args] are invalid.
   factory Configuration.parse(List<String> arguments) => args.parse(arguments);
 
   /// Loads the configuration from [path].
   ///
   /// Throws an [IOException] if [path] does not exist or cannot be read. Throws
   /// a [FormatException] if its contents are invalid.
   factory Configuration.load(String path) => load(path);
 
-  Configuration({bool help, bool version, bool verboseTrace, bool jsTrace,
-          bool pauseAfterLoad, bool color, String packageRoot, String reporter,
-          int pubServePort, int concurrency, Timeout timeout, this.pattern,
-          Iterable<TestPlatform> platforms, Iterable<String> paths,
-          Glob filename, BooleanSelector includeTags,
-          BooleanSelector excludeTags, Iterable addTags,
+  Configuration({
+          bool help,
+          bool version,
+          bool verboseTrace,
+          bool jsTrace,
+          bool skip,
+          this.skipReason,
+          PlatformSelector testOn,
+          bool pauseAfterLoad,
+          bool color,
+          String packageRoot,
+          String reporter,
+          int pubServePort,
+          int concurrency,
+          Timeout timeout,
+          this.pattern,
+          Iterable<TestPlatform> platforms,
+          Iterable<String> paths,
+          Glob filename,
+          BooleanSelector includeTags,
+          BooleanSelector excludeTags,
+          Iterable addTags,
           Map<BooleanSelector, Configuration> tags})
       : _help = help,
         _version = version,
         _verboseTrace = verboseTrace,
         _jsTrace = jsTrace,
+        _skip = skip,
+        testOn = testOn ?? PlatformSelector.all,
         _pauseAfterLoad = pauseAfterLoad,
         _color = color,
         _packageRoot = packageRoot,
         _reporter = reporter,
         pubServeUrl = pubServePort == null
             ? null
             : Uri.parse("http://localhost:$pubServePort"),
         _concurrency = concurrency,
         timeout = (pauseAfterLoad ?? false)
             ? Timeout.none
@@ skipping 27 matching lines @@
   ///
   /// For most fields, if both configurations have values set, [other]'s value
   /// takes precedence. However, certain fields are merged together instead.
   /// This is indicated in those fields' documentation.
   Configuration merge(Configuration other) {
     return new Configuration(
         help: other._help ?? _help,
         version: other._version ?? _version,
         verboseTrace: other._verboseTrace ?? _verboseTrace,
         jsTrace: other._jsTrace ?? _jsTrace,
+        skip: other._skip ?? _skip,
+        skipReason: other.skipReason ?? skipReason,
+        testOn: testOn.intersection(other.testOn),
         pauseAfterLoad: other._pauseAfterLoad ?? _pauseAfterLoad,
         color: other._color ?? _color,
         packageRoot: other._packageRoot ?? _packageRoot,
         reporter: other._reporter ?? _reporter,
         pubServePort: (other.pubServeUrl ?? pubServeUrl)?.port,
         concurrency: other._concurrency ?? _concurrency,
         timeout: timeout.merge(other.timeout),
         pattern: other.pattern ?? pattern,
         platforms: other._platforms ?? _platforms,
         paths: other._paths ?? _paths,
         filename: other._filename ?? _filename,
         includeTags: includeTags.intersection(other.includeTags),
         excludeTags: excludeTags.union(other.excludeTags),
         addTags: other.addTags.union(addTags),
         tags: mergeMaps(tags, other.tags,
             value: (config1, config2) => config1.merge(config2)));
   }
 }