Multitest annotations now accept multiple annotations on one line.

tools/testing/dart/test_runner.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 319 matching lines @@
       // OK to Skip error output that doesn't match the machine format
     }
     if (testCase.info != null 
         && testCase.info.optionsFromFile['isMultitest']) {
       return _didMultitestFail(errors, staticWarnings);
     }
     return _didStandardTestFail(errors, staticWarnings);
   }
   
   bool _didMultitestFail(List errors, List staticWarnings) {
-    String outcome = testCase.info.multitestOutcome;
-    if ((outcome == '' || outcome == 'compile-time error') && errors.length > 0) {
+    Set<String> outcome = testCase.info.multitestOutcome;

[Bill Hesse, 2012/03/08 10:21:49]

It should be checked that we never reach here with a null multitestOutcome -
this is only enforced by control flow.

[zundel, 2012/03/08 13:18:00]

Added assertion

+    if ((outcome.contains('') || outcome.contains('compile-time error')) 

[Bill Hesse, 2012/03/08 10:21:49]

Isn't this check about not containing 'run-time error', not about not containing
the other two?  '' shouldn't really be an element of the set anyway - you may
want to use the empty set instead.

[zundel, 2012/03/08 13:18:00]

Besides runtime-error, we also don't want 'errors' populated for dynamic-type
errors and static-type errors. I think the root of the problem is that a test
annotated with 'compile-time' error is supposed to come back marked as 'failed',
even though this is the expected outcome.  If we get rid of the 'negative test'
concept, I think this might be simpler.

+        && errors.length > 0) {
       return true;
-    } else if (outcome == 'static type error' && staticWarnings.length > 0) {
+    } else if (outcome.contains('static type error') 
+        && staticWarnings.length > 0) {
       return true;
     }
     return false;
   }
   
   bool _didStandardTestFail(List errors, List staticWarnings) {
     bool hasFatalTypeErrors = false;
     int numStaticTypeAnnotations = 0;
     int numCompileTimeAnnotations = 0;
     var isStaticClean = false;
@@ skipping 772 matching lines @@
         // the developer doesn't waste his or her time trying to fix a bunch of
         // tests that appear to be broken but were actually just flakes that
         // didn't get retried because there had already been one failure.
         bool allowRetry = _MAX_FAILED_NO_RETRY > _progress.numFailedTests;
         new RunningProcess(test, allowRetry, this).start();
       }
       _numProcesses++;
     }
   }
 }