Tweaks to the analysis server benchmarks.

pkg/analysis_server/benchmark/perf/benchmarks_impl.dart

 // Copyright (c) 2017, 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:async';
 import 'dart:io';
 
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:path/path.dart' as path;
 
 import '../../test/integration/support/integration_tests.dart';
 import '../benchmarks.dart';
 import 'memory_tests.dart';
 
 /// benchmarks:
 ///   - analysis-server-cold-analysis
 ///   - analysis-server-cold-memory
 class ColdAnalysisBenchmark extends Benchmark {
   ColdAnalysisBenchmark()
       : super(
-          'analysis-server-cold',
-          'Analysis server benchmarks of a large project on start-up, no '
-              'existing driver cache.',
-        );
+            'analysis-server-cold',
+            'Analysis server benchmarks of a large project on start-up, no '
+            'existing driver cache.',
+            kind: 'group');
 
   int get maxIterations => 3;
 
   @override
   Future<BenchMarkResult> run({bool quick: false}) async {
-    deleteServerCache();
+    if (!quick) {
+      deleteServerCache();
+    }
 
     Stopwatch stopwatch = new Stopwatch()..start();
 
     AnalysisServerMemoryUsageTest test = new AnalysisServerMemoryUsageTest();
     await test.setUp();
     await test.subscribeToStatusNotifications();
     await test.sendAnalysisSetAnalysisRoots(getProjectRoots(quick: quick), []);
     await test.analysisFinished;
 
     stopwatch.stop();
@@ skipping 11 matching lines @@
 }
 
 /// benchmarks:
 ///   - analysis-server-warm-analysis
 ///   - analysis-server-warm-memory
 ///   - analysis-server-edit
 ///   - analysis-server-completion
 class AnalysisBenchmark extends Benchmark {
   AnalysisBenchmark()
       : super(
-          'analysis-server',
-          'Analysis server benchmarks of a large project, with an existing '
-              'driver cache.',
-        );
+            'analysis-server',
+            'Analysis server benchmarks of a large project, with an existing '
+            'driver cache.',
+            kind: 'group');
 
   @override
   Future<BenchMarkResult> run({bool quick: false}) async {
     Stopwatch stopwatch = new Stopwatch()..start();
 
     AnalysisServerMemoryUsageTest test = new AnalysisServerMemoryUsageTest();
     await test.setUp();
     await test.subscribeToStatusNotifications();
     await test.sendAnalysisSetAnalysisRoots(getProjectRoots(quick: quick), []);
     await test.analysisFinished;
@@ skipping 98 matching lines @@
         await test.sendAnalysisUpdateContent(
             {filePath: new AddContentOverlay(contents)});
       }
     }
 
     stopwatch.stop();
 
     return stopwatch.elapsedMicroseconds ~/ completionCount;
   }
 }