| Index: samples/tests/samples/samples.status | 
| =================================================================== | 
| --- samples/tests/samples/samples.status	(revision 5854) | 
| +++ samples/tests/samples/samples.status	(working copy) | 
| @@ -2,7 +2,7 @@ | 
| # 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. | 
|  | 
| -[ $component == dartc ] | 
| +[ $compiler == dartc ] | 
| chat/*: Skip | 
|  | 
| [ $arch == x64 ] | 
| @@ -15,7 +15,7 @@ | 
| *: Skip | 
|  | 
|  | 
| -[ $component == chromium || $component == dartium || $component == frogium || $component == legium] | 
| +[ $runtime == drt ] | 
| chat/ChatServerTest: Skip | 
| chat/HttpTest: Skip | 
| chat/HttpParserTest: Skip | 
| @@ -28,27 +28,23 @@ | 
| UrlEncodingTest: Skip | 
| #proxy/*_generatedTest: Skip | 
|  | 
| -[ $component == chromium ] | 
| -dartcombat/DartCombatTest: Skip # Issue 1218 | 
| -DartCombatTest: Skip | 
| - | 
| -[ $component == dartium ] | 
| +[ $compiler == none && $runtime == drt ] | 
| dartcombat/DartCombatTest: Skip # Bug 5279716 | 
| DartCombatTest: Skip | 
| proxy/MintMakerFullyIsolated_generatedTest: Skip | 
|  | 
| -[ $component == dartium && $mode == debug ] | 
| +[ $compiler == none && $runtime == drt && $mode == debug ] | 
| swarm/SwarmTest: Skip # Issue 1617 | 
| SwarmTest: Skip | 
|  | 
| -[ $component == frogium || ($component == webdriver && ($browser == chrome || $browser == ff || $browser == safari)) ] | 
| +[ ($compiler == frog && $runtime == drt) || ($runtime == chrome || $runtime == ff || $runtime == safari)) ] | 
| dartcombat/DartCombatTest: Skip # passes locally but timeout on bot? | 
| DartCombatTest: Skip | 
|  | 
| -[ $component == webdriver && $browser == safari ] | 
| +[ $runtime == safari ] | 
| PromiseBasedTest: Skip | 
|  | 
| -[ $component == vm] | 
| +[ $runtime == vm] | 
| dartcombat/DartCombatTest: Skip | 
| DartCombatTest: Skip | 
| SwarmTest: Skip | 
| @@ -60,8 +56,5 @@ | 
| lib/util/UtilTest: Skip | 
| lib/view/ViewTest: Skip | 
|  | 
| -[ $component == frog ] | 
| +[ ($compiler == frog || $compiler == frogsh) && $runtime == d8 ] | 
| *: Skip | 
| - | 
| -[ $component == frogsh ] | 
| -*: Skip | 
|  |