Complete merge of kernel repo into SDK.

This removes third_party/pkg/kernel and changes dependencies to
refer to pkg/kernel instead.

Some status files are updated to reflect new test outcomes.
This commit is contained in:
Asger Feldthaus 2016-11-23 12:46:29 +01:00
parent a45478f271
commit ce428a1f20
9 changed files with 16 additions and 20 deletions

View file

@ -50,7 +50,7 @@ js:pkg/js/lib
js_ast:pkg/js_ast/lib
js_runtime:sdk/lib/_internal/js_runtime/lib
json_rpc_2:third_party/pkg/json_rpc_2/lib
kernel:third_party/pkg/kernel/lib
kernel:pkg/kernel/lib
linter:third_party/pkg/linter/lib
logging:third_party/pkg/logging/lib
lookup_map:pkg/lookup_map/lib

3
DEPS
View file

@ -73,7 +73,6 @@ vars = {
"isolate_tag": "@0.2.3",
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
"json_rpc_2_tag": "@2.0.2",
"kernel_rev": "@8e2b2c03c2a22d9fdf581a8e3ce798f189531081",
"linter_tag": "@0.1.29",
"logging_tag": "@0.11.3+1",
"markdown_tag": "@0.11.0",
@ -235,8 +234,6 @@ deps = {
(Var("github_dartlang") % "isolate") + Var("isolate_tag"),
Var("dart_root") + "/third_party/pkg/json_rpc_2":
(Var("github_mirror") % "json_rpc_2") + Var("json_rpc_2_tag"),
Var("dart_root") + "/third_party/pkg/kernel":
(Var("github_mirror") % "kernel") + Var("kernel_rev"),
Var("dart_root") + "/third_party/pkg/linter":
(Var("github_mirror") % "linter") + Var("linter_tag"),
Var("dart_root") + "/third_party/pkg/logging":

View file

@ -12,7 +12,7 @@ dependencies:
js_runtime:
path: ../../sdk/lib/_internal/js_runtime
kernel:
path: ../../third_party/pkg/kernel
path: ../../pkg/kernel
sdk_library_metadata:
path: ../../sdk/lib/_internal/sdk_library_metadata
dart2js_info: ^0.3.0

View file

@ -12,7 +12,7 @@ dependencies:
dev_dependencies:
# TODO(sigmund): update to a version constraint once we roll the latest kernel
# to the repo.
kernel: {path: ../../third_party/pkg/kernel}
kernel: {path: ../../pkg/kernel}
package_config: '^1.0.0'
test: ^0.12.0
test_reflective_loader: ^0.1.0

View file

@ -238,6 +238,7 @@ Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01/01: MissingRunti
Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t02: CompileTimeError
Language/Libraries_and_Scripts/Imports/invalid_uri_t02: Pass
Language/Libraries_and_Scripts/Imports/static_type_t01: RuntimeError
Language/Libraries_and_Scripts/Parts/compilation_t02: Pass Crash
Language/Libraries_and_Scripts/Parts/syntax_t06: Pass
Language/Libraries_and_Scripts/Scripts/top_level_main_t01: Crash
Language/Libraries_and_Scripts/Scripts/top_level_main_t02: Crash

View file

@ -19,7 +19,7 @@ import 'package:test/test.dart';
import '../memory_compiler.dart';
const String TESTCASE_DIR = 'third_party/pkg/kernel/testcases/';
const String TESTCASE_DIR = 'pkg/kernel/testcases/';
const List<String> SKIP_TESTS = const <String>[
/// The test expects an unpatched api.

View file

@ -177,15 +177,15 @@ generic_creation_test: RuntimeError
generic_field_mixin2_test: RuntimeError
generic_field_mixin4_test: RuntimeError
generic_field_mixin5_test: RuntimeError
generic_functions_test: Crash
generic_functions_test: CompileTimeError
generic_inheritance_test: RuntimeError
generic_local_functions_test: Crash
generic_methods_function_type_test: Crash
generic_methods_generic_function_parameter_test: Crash
generic_methods_new_test: Crash
generic_methods_test: Crash
generic_methods_type_expression_test: Crash
generic_sends_test: Pass, Crash
generic_local_functions_test: CompileTimeError
generic_methods_function_type_test: CompileTimeError
generic_methods_generic_function_parameter_test: CompileTimeError
generic_methods_new_test: CompileTimeError
generic_methods_test: CompileTimeError
generic_methods_type_expression_test: CompileTimeError
generic_sends_test: CompileTimeError
generic_test: RuntimeError
getter_closure_execution_order_test: RuntimeError
getter_setter_in_lib_test: RuntimeError
@ -284,6 +284,7 @@ multiline_newline_test/04: MissingCompileTimeError
multiline_newline_test/05: MissingCompileTimeError
multiline_newline_test/06: MissingCompileTimeError
multiline_newline_test/none: RuntimeError
named_parameters_default_eq_test/none: CompileTimeError
named_parameters_type_test/01: MissingRuntimeError
named_parameters_type_test/02: MissingRuntimeError
named_parameters_type_test/03: MissingRuntimeError
@ -695,4 +696,4 @@ vm/debug_break_enabled_vm_test/01: CompileTimeError
vm/debug_break_enabled_vm_test/none: CompileTimeError
vm/reflect_core_vm_test: CompileTimeError
vm/type_cast_vm_test: RuntimeError
vm/type_vm_test: RuntimeError
vm/type_vm_test: RuntimeError

View file

@ -7,7 +7,7 @@
PROG_NAME="$BASH_SOURCE"
WRAPPERS_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
DART_ROOT="$(cd "${WRAPPERS_DIR}/../.." ; pwd -P)"
DARTK="$DART_ROOT/third_party/pkg/kernel/bin/dartk.dart"
DARTK="$DART_ROOT/pkg/kernel/bin/dartk.dart"
if [[ `uname` == 'Darwin' ]];
then

View file

@ -40,7 +40,6 @@ vars.update({
"http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4",
"http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235",
"json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c",
"kernel_rev": "@1906e420431656d351a9f4ee9a36b8ca9a4da1db",
"logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597",
"matcher_tag": "@0.12.0",
"mime_rev": "@75890811d4af5af080351ba8a2853ad4c8df98dd",
@ -111,8 +110,6 @@ deps.update({
(Var("github_mirror") % "http_parser") + Var("http_parser_rev"),
"src/dart/third_party/pkg/http_throttle":
(Var("github_mirror") % "http_throttle") + Var("http_throttle_rev"),
"src/dart/third_party/pkg/kernel":
(Var("github_mirror") % "kernel") + Var("kernel_rev"),
"src/dart/third_party/pkg/logging":
(Var("github_mirror") % "logging") + Var("logging_rev"),
"src/dart/third_party/pkg/matcher":