Skip to content

Commit b64ef27

Browse files
dcharkesCommit Queue
authored and
Commit Queue
committed
[pkg/ffi] Roll dart-lang/native
Rolling dart-lang/native#87 manually because of the c_compiler -> native_toolchain_c rename. Change-Id: I2592882a7137a40703f96a487a66d31eac7c990d Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-win-release-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313200 Commit-Queue: Daco Harkes <[email protected]> Reviewed-by: Devon Carew <[email protected]>
1 parent c54b4bc commit b64ef27

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ vars = {
158158
"matcher_rev": "ce8f40934c90e12992071172795b3bca29fac295",
159159
"mime_rev": "bdb66bdd354156280bddc30e2d322a4ad355f671",
160160
"mockito_rev": "451f756fe12a32d2a943db80124b522ecbd557af",
161-
"native_rev": "de1b0ccf24a89315fe76116090d9fe1b8bd774bb",
161+
"native_rev": "1e89ed99e344fde0226ff472d290dd9fd0998d16",
162162
"package_config_rev": "be0c4411cb7607abe3fd531c9653b0ba53c87c0f",
163163
"path_rev": "282dd18bd9ae2e265ea40a29b2c637194e9be8b7",
164164
"pool_rev": "77001024a16126cc5718e654ea3e57bbf6e7fac3",

pkg/test_runner/lib/src/test_configurations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ final testSuiteDirectories = [
5151
Path('tests/web_2'),
5252
Path('third_party/pkg/dart_style'),
5353
Path('third_party/pkg/dartdoc'),
54-
Path('third_party/pkg/native/pkgs/c_compiler'),
5554
Path('third_party/pkg/native/pkgs/native_assets_builder'),
5655
Path('third_party/pkg/native/pkgs/native_assets_cli'),
56+
Path('third_party/pkg/native/pkgs/native_toolchain_c'),
5757
Path('third_party/pkg/package_config'),
5858
Path('utils/tests/peg'),
5959
];

third_party/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
!unittest.tar.gz.sha1
1010
!update.sh
1111
!/wasmer
12-
!/pkg/c_compiler.status
1312
!/pkg/native_assets_builder.status
1413
!/pkg/native_assets_cli.status
14+
!/pkg/native_toolchain_c.status
1515
# but ignore a subfolder of tcmalloc (some client ignores /tcmalloc/.gitignore)
1616
/tcmalloc/gperftools

third_party/pkg/native_assets_cli.status

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5+
example/*: SkipByDesign # These test projects don't work without running pub in the project itself.
6+
57
[ $runtime != vm ]
68
*: SkipByDesign # Native assets is a VM-only feature.

tools/bots/test_matrix.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3028,10 +3028,10 @@
30283028
"name": "third_party tested packages",
30293029
"arguments": [
30303030
"-nunittest-asserts-${mode}-${system}",
3031-
"c_compiler",
30323031
"dart_style",
30333032
"native_assets_builder",
30343033
"native_assets_cli",
3034+
"native_toolchain_c",
30353035
"package_config"
30363036
]
30373037
},
@@ -3090,7 +3090,7 @@
30903090
"name": "third_party tested packages",
30913091
"arguments": [
30923092
"-nunittest-asserts-${mode}-${system}-arm64",
3093-
"c_compiler",
3093+
"native_toolchain_c",
30943094
"dart_style",
30953095
"native_assets_builder",
30963096
"native_assets_cli",
@@ -3134,7 +3134,7 @@
31343134
"name": "third_party tested packages",
31353135
"arguments": [
31363136
"-nunittest-asserts-${mode}-${system}",
3137-
"c_compiler",
3137+
"native_toolchain_c",
31383138
"dart_style",
31393139
"native_assets_builder",
31403140
"native_assets_cli",
@@ -3519,4 +3519,4 @@
35193519
"macos": "buildtools/mac-x64/clang/bin/llvm-symbolizer",
35203520
"windows": "buildtools/win-x64/clang/bin/llvm-symbolizer.exe"
35213521
}
3522-
}
3522+
}

0 commit comments

Comments
 (0)