[infra] Simplify vm-kernel configurations in test matrix

This also adds the missing vm-kernel opt-counter builder.

Bug: https://github.com/dart-lang/sdk/issues/31753
Change-Id: I0199218f83d227cfc52505c213d7b689acd9c43e
Reviewed-on: https://dart-review.googlesource.com/31984
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
This commit is contained in:
Alexander Thomas 2018-01-09 19:45:45 +01:00 committed by commit-bot@chromium.org
parent 8e3da7df7c
commit 89bd41d19a
7 changed files with 59 additions and 113 deletions

View file

@ -225,7 +225,7 @@ dart_messages/test/dart_messages_test: Skip # Uses dart:io.
[ $browser || $jscl ]
kernel/test/*: SkipByDesign # Uses dart:io and bigints.
[ $runtime == vm && ($arch == simarm64 || $arch == simarm || $arch == simarmv6 || $arch == simarmv5te || $arch == armv6 || $arch == armv5te) ]
[ $runtime == vm && ($arch == simarm64 || $arch == simarm || $arch == simarmv6 || $arch == simarmv5te || $arch == armv6 || $arch == armv5te || $arch == simdbc64) ]
# Timeout. These are not unit tests. They do not run efficiently on our
# simulator or low-end devices.
*: Skip

View file

@ -66,10 +66,10 @@ dev_fs_weird_char_test: Skip # Windows disallows question mark in paths
# batch mode.
[ $arch == simdbc64 && $compiler == dartk ]
coverage_optimized_function_test: Crash # Please triage
get_cpu_profile_timeline_rpc_test: Pass, RuntimeError # http://dartbug.com/31794
[ $arch == simdbc64 && $compiler == dartk && $mode == debug ]
eval_test: Pass, Slow
get_cpu_profile_timeline_rpc_test: Pass, RuntimeError # http://dartbug.com/31794
[ $builder_tag == strong && $compiler == dart2analyzer ]
*: Skip # Issue 28649

View file

@ -59,6 +59,7 @@ auth_token_test: CompileTimeError
awaiter_async_stack_contents_test: CompileTimeError
bad_web_socket_address_test: CompileTimeError
break_on_activation_test: CompileTimeError
break_on_default_constructor_test: CompileTimeError
break_on_function_test: CompileTimeError
breakpoint_in_parts_class_test: CompileTimeError
breakpoint_two_args_checked_test: CompileTimeError
@ -74,6 +75,7 @@ contexts_test: CompileTimeError
coverage_leaf_function_test: CompileTimeError
coverage_optimized_function_test: CompileTimeError
crash_dump_test: CompileTimeError
dart/spawn_infinite_loop_test: RuntimeError
debugger_inspect_test: CompileTimeError
debugger_location_second_test: CompileTimeError
debugger_location_test: CompileTimeError
@ -188,6 +190,7 @@ step_over_await_test: CompileTimeError
step_test: CompileTimeError
step_through_arithmetic_test: CompileTimeError
step_through_constructor_calls_test: CompileTimeError
step_through_constructor_test: CompileTimeError
step_through_function_2_test: CompileTimeError
step_through_function_test: CompileTimeError
step_through_getter_test: CompileTimeError

View file

@ -335,13 +335,16 @@ dart/data_uri_spawn_test: CompileTimeError # Issue 31586
dart/optimized_stacktrace_line_and_column_test: CompileTimeError # Issue 31586
dart/optimized_stacktrace_line_test: CompileTimeError # Issue 31586
[ $compiler == dartk && $strong && ($arch == simarm || $arch == simarm64 || $arch == simdbc64) ]
dart/spawn_infinite_loop_test: RuntimeError
# Enabling of dartk for sim{arm,arm64,dbc64} revelaed these test failures, which
# are to be triaged. Isolate tests are skipped on purpose due to the usage of
# batch mode.
[ $compiler == dartk && ($arch == simarm || $arch == simarm64 || $arch == simdbc64) ]
dart/data_uri_spawn_test: Skip # Please triage.
dart/snapshot_version_test: RuntimeError # Please triage.
dart/spawn_infinite_loop_test: Crash # Please triage.
dart/spawn_infinite_loop_test: Crash
[ $compiler == dartkp && !$strong ]
dart/truncating_ints_test: Skip # This test cannot be run in dartkp/legacy mode (gen_kernel does not pass --limit-ints-to-64-bits in legacy mode).

View file

@ -104,7 +104,6 @@ spawn_uri_test: SkipByDesign # Loading another file is not supported in JS shell
isolate_stress_test: Pass, Slow # Issue 10697
[ $compiler == dartk && $strong ]
isolate_complex_messages_test: Crash
issue_21398_parent_isolate1_test: RuntimeError
issue_22778_test: Crash
message3_test/byteBuffer: RuntimeError

View file

@ -1,7 +1,6 @@
# Copyright (c) 2016, 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.
unsorted/invocation_errors_test: RuntimeError
[ $compiler == dart2js ]
unsorted/invocation_errors_test: Pass
@ -11,6 +10,9 @@ unsorted/simple_literal_test: Crash # Issue 31762
unsorted/super_initializer_test: Skip
unsorted/super_mixin_test: CompileTimeError
[ !$strong ]
unsorted/invocation_errors_test: RuntimeError
[ $builder_tag == strong && $compiler == dart2analyzer ]
*: Skip # Issue 28649
@ -19,14 +21,16 @@ unsorted/invocation_errors_test: StaticWarning
unsorted/super_mixin_test: CompileTimeError
[ $compiler == dartk && $strong ]
unsorted/invocation_errors_test: CompileTimeError
unsorted/loop_test: RuntimeError
unsorted/nsm_dispatcher_test: CompileTimeError
unsorted/super_mixin_test: CompileTimeError
unsorted/types_test: RuntimeError
[ $runtime == dart_precompiled && $minified ]
unsorted/symbol_literal_test: Skip # Expects unobfuscated Symbol.toString.
[ $runtime == dart_precompiled || $runtime == vm || ($compiler == dart2js && $dart2js_with_kernel) ]
[ $runtime == dart_precompiled || $runtime == vm || $compiler == dart2js && $dart2js_with_kernel ]
unsorted/loop_test: CompileTimeError # Large integer literal
unsorted/simple_literal_test: CompileTimeError # Large integer literal

View file

@ -116,7 +116,9 @@
},
{
"builders": [
"vm-kernel-precomp-linux-release-x64"
"vm-kernel-precomp-linux-release-x64",
"vm-kernel-precomp-linux-release-simarm",
"vm-kernel-precomp-linux-release-simarm64"
],
"meta": {
"description": "This configuration is used by the vm kernel release builder."
@ -126,21 +128,13 @@
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"runtime",
"runtime_kernel",
"dart_bootstrap",
"dart_precompiled_runtime"
]
},
{
"name": "vm tests",
"arguments": ["--compiler=dartkp", "--runtime=dart_precompiled"],
"exclude_tests": [
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
],
"fileset": "vm_debug",
"shards": 6
},
@ -151,12 +145,6 @@
"--runtime=dart_precompiled",
"--strong"
],
"tests": [
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
],
"fileset": "vm_debug",
"shards": 6
}
@ -167,16 +155,14 @@
"vm-kernel-precomp-linux-debug-x64"
],
"meta": {
"description": "This configuration is used by the vm kernel debug builder."
"description": "This configuration is used by the vm kernel precomp debug builder."
},
"steps": [
{
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"runtime",
"runtime_kernel",
"dart_bootstrap",
"dart_precompiled_runtime"
]
},
@ -187,12 +173,6 @@
"--runtime=dart_precompiled",
"--vm-options=--no-enable-malloc-hooks"
],
"exclude_tests": [
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
],
"fileset": "vm_debug",
"shards": 6
},
@ -204,12 +184,6 @@
"--vm-options=--no-enable-malloc-hooks",
"--strong"
],
"tests": [
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
],
"fileset": "vm_debug",
"shards": 6
}
@ -254,77 +228,10 @@
{
"builders": [
"vm-kernel-linux-debug-simdbc64",
"vm-kernel-linux-debug-x64",
"vm-kernel-linux-release-simarm",
"vm-kernel-linux-release-simarm64",
"vm-kernel-linux-release-simdbc64"
],
"meta": {
"description": "This configuration is used by the simarm/simdbc vm kernel builders."
},
"steps": [
{
"name": "build dart",
"script": "tools/build.py",
"arguments": ["runtime_kernel"]
},
{
"name": "dartk tests",
"arguments": ["-cdartk"]
},
{
"name": "dartk strong tests",
"arguments": [
"-cdartk",
"--strong",
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
]
}
]
},
{
"builders": [
"vm-kernel-precomp-linux-release-simarm",
"vm-kernel-precomp-linux-release-simarm64"
],
"meta": {
"description": "This configuration is used by the simarm vm kernel precomp release builders."
},
"steps": [
{
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"runtime_kernel",
"dart_precompiled_runtime"
]
},
{
"name": "dartk tests",
"arguments": [
"-cdartk",
"-rdart_precompiled"
]
},
{
"name": "dartk strong tests",
"arguments": [
"-cdartk",
"-rdart_precompiled",
"--strong",
"language_2",
"corelib_2",
"lib_2",
"standalone_2"
]
}
]
},
{
"builders": [
"vm-kernel-linux-debug-x64",
"vm-kernel-linux-release-simdbc64",
"vm-kernel-linux-release-x64",
"vm-kernel-mac-debug-x64",
"vm-kernel-mac-release-x64"
@ -336,22 +243,20 @@
{
"name": "build dart",
"script": "tools/build.py",
"arguments": ["runtime","runtime_kernel"]
"arguments": ["runtime_kernel"]
},
{
"name": "front-end tests",
"arguments": ["--runtime=vm","--compiler=none","--checked"],
"arguments": ["--compiler=none", "--checked"],
"tests": ["pkg/front_end"]
},
{
"name": "vm tests",
"arguments": ["--runtime=vm","--compiler=dartk"],
"exclude_tests": ["language_2","corelib_2","lib_2","standalone_2"]
"arguments": ["--compiler=dartk"]
},
{
"name": "strong vm tests",
"arguments": ["--runtime=vm","--compiler=dartk","--strong"],
"tests": ["language_2","corelib_2","lib_2","standalone_2"]
"arguments": ["--compiler=dartk", "--strong"]
}
]
},
@ -532,7 +437,7 @@
{
"name": "build dart",
"script": "tools/build.py",
"arguments": ["runtime","runtime_precompiled"]
"arguments": ["runtime", "runtime_precompiled"]
},
{
"name": "vm tests",
@ -554,7 +459,7 @@
{
"name": "build dart",
"script": "tools/build.py",
"arguments": ["--arch=arm","--os=android","runtime","runtime_precompiled"]
"arguments": ["--arch=arm", "--os=android", "runtime", "runtime_precompiled"]
},
{
"name": "vm tests",
@ -595,6 +500,38 @@
}
]
},
{
"builders": [
"vm-kernel-optcounter-threshold-linux-release-x64"
],
"meta": {
"description": "This is the configuration for the kernel optcounter builders, under the vm-kernel group. They run the same tests as the ordinary VM kernel builders, but add extra options to the vm."
},
"steps": [
{
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"runtime_kernel"
]
},
{
"name": "vm tests",
"arguments": [
"--compiler=dartk",
"--vm-options=--optimization-counter-threshold=5"
]
},
{
"name": "strong vm tests",
"arguments": [
"--compiler=dartk",
"--strong",
"--vm-options=--optimization-counter-threshold=5"
]
}
]
},
{
"builders": [
"vm-reload-linux-debug-x64",