Reaply "Use a real package-root for all of our samples (and tests inside a package) instead of buil…

dart/tools/testing/dart/test_options.dart

Index: dart/tools/testing/dart/test_options.dart
diff --git a/dart/tools/testing/dart/test_options.dart b/dart/tools/testing/dart/test_options.dart
index 466c67abad685a78edc5fcf5d8e15622db6fe8c5..a9b407ed3896ea669446b576035cfd1246e34379 100644
--- a/dart/tools/testing/dart/test_options.dart
+++ b/dart/tools/testing/dart/test_options.dart
@@ -279,6 +279,15 @@ Note: currently only implemented for dart2js.''',
               [],
               false,
               'bool'),
+            new _TestOptionSpecification(
+                'use_repository_packages',
+                'For tests using packages: Use pub.dartlang.org packages '
+                'but use overrides for the packages available in the '
+                'repository.',
+                ['--use-repository-packages'],
+                [],
+                false,
+            'bool'),
           new _TestOptionSpecification(
               'build_directory',
               'The name of the build directory, where products are placed.',
@@ -593,6 +602,12 @@ Note: currently only implemented for dart2js.''',
       print("Error: shard index is ${config['shard']} out of "
             "${config['shards']} shards");
     }
+
+    if (config['use_repository_packages'] && config['use_public_packages']) {
+      isValid = false;
+      print("Cannot have both --use-repository-packages and "
+            "--use-public-packages");
+    }
     return isValid;
   }
 
@@ -618,8 +633,6 @@ Note: currently only implemented for dart2js.''',
     // Create the artificial negative options that test status files
     // expect.
     configuration['unchecked'] = !configuration['checked'];
-    configuration['use_repository_packages'] =
-        !configuration['use_public_packages'];
     configuration['host_unchecked'] = !configuration['host_checked'];
     configuration['unminified'] = !configuration['minified'];
     configuration['nocsp'] = !configuration['csp'];