Print out experimental test.py reproduction command

[email protected]

Review URL: https://codereview.chromium.org//17361003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@24231 260f80e4-7a28-3924-810f-c04153c831b5

Author: mkustermann

tools/testing/dart/test_options.dart

@@ -462,9 +462,56 @@ Note: currently only implemented for dart2js.''',
 
     List<Map> expandedConfigs = _expandConfigurations(configuration);
     List<Map> result = expandedConfigs.where(_isValidConfig).toList();
+    for (var config in result) {
+     config['_reproducing_arguments_'] =
+         _constructReproducingCommandArguments(config);
+    }
     return result.isEmpty ? null : result;
   }
 
+  // For printing out reproducing command lines, we don't want to add these
+  // options.
+  Set<String>  _blacklistedOptions = new Set<String>.from([
+    'progress', 'failure-summary', 'step_name', 'report', 'tasks', 'verbose',
+    'time', 'dart', 'drt', 'dartium', 'build_directory', 'append_logs',
+    'write_debug_log', 'local_ip', 'shard', 'shards',
+  ]);
+
+  List<String> _constructReproducingCommandArguments(Map config) {
+    var arguments = new List<String>();
+    for (var configKey in config.keys) {
+      if (!_blacklistedOptions.contains(configKey)) {
+        for (var option in _options) {
+          var configValue = config[configKey];
+          // We only include entries of [conf] if we find an option for it.
+          if (configKey == option.name && configValue != option.defaultValue) {
+            var isBooleanOption = option.type == 'bool';
+            // Sort by length, so we get the shortest variant.
+            var possibleOptions = new List.from(option.keys);
+            possibleOptions.sort((a, b) => (a.length < b.length ? -1 : 1));
+            var key = possibleOptions[0];
+            if (key.startsWith('--')) {
+              // long version
+              arguments.add(key);
+              if (!isBooleanOption) {
+                arguments.add("$configValue");
+              }
+            } else {
+              // short version
+              assert(key.startsWith('-'));
+              if (!isBooleanOption) {
+                arguments.add("$key$configValue");
+              } else {
+                arguments.add(key);
+              }
+            }
+          }
+        }
+      }
+    }
+    return arguments;
+  }
+
   /**
    * Determine if a particular configuration has a valid combination of compiler
    * and runtime elements.

tools/testing/dart/test_progress.dart

@@ -137,6 +137,15 @@ List<String> _buildFailureOutput(TestCase test,
       output.add('Did not run');
     }
   }
+
+  var arguments = ['python', 'tools/test.py'];
+  arguments.addAll(test.configuration['_reproducing_arguments_']);
+  arguments.add(test.displayName);
+  var testPyCommandline = arguments.map(escapeCommandLineArgument).join(' ');
+
+  output.add('');
+  output.add('Short reproduction command (experimental):');
+  output.add("    $testPyCommandline");
   return output;
 }
 

tools/testing/dart/test_runner.dart

@@ -116,8 +116,9 @@ class Command {
       executable = executable.replaceAll('/', '\\');
     }
     var quotedArguments = [];
-    arguments.forEach((argument) => quotedArguments.add('"$argument"'));
-    commandLine = "\"$executable\" ${quotedArguments.join(' ')}";
+    quotedArguments.add(escapeCommandLineArgument(executable));
+    quotedArguments.addAll(arguments.map(escapeCommandLineArgument));
+    commandLine = quotedArguments.join(' ');
   }
 
   String toString() => commandLine;

tools/testing/dart/utils.dart

@@ -75,3 +75,12 @@ String decodeUtf8(List<int> bytes) {
   return utf.decodeUtf8(bytes);
 }
 
+// This function is pretty stupid and only puts quotes around an argument if
+// it the argument contains a space.
+String escapeCommandLineArgument(String argument) {
+  if (argument.contains(' ')) {
+    return '"$argument"';
+  }
+  return argument;
+}
+