combine script extractor and import inliner

pkg/polymer/test/build/common.dart

Index: pkg/polymer/test/build/common.dart
diff --git a/pkg/polymer/test/build/common.dart b/pkg/polymer/test/build/common.dart
index be187ca393c39e34f43767dd4cdb08eac15e3ceb..91e6b11a76472965b4f235a83366ee4d9b63cab8 100644
--- a/pkg/polymer/test/build/common.dart
+++ b/pkg/polymer/test/build/common.dart
@@ -123,10 +123,10 @@ class TestHelper implements PackageProvider {
 
 testPhases(String testName, List<List<Transformer>> phases,
     Map<String, String> inputFiles, Map<String, String> expectedFiles,
-    [List<String> expectedMessages]) {
-  test(testName, () {
+    [List<String> expectedMessages, bool solo = false]) {
+  (solo ? solo_test : test)(testName, () {
     var helper = new TestHelper(phases, inputFiles, expectedMessages)..run();
-    return helper.checkAll(expectedFiles).then((_) => helper.tearDown());
+    return helper.checkAll(expectedFiles).whenComplete(() => helper.tearDown());
   });
 }