Skip to content

Commit 93c74ef

Browse files
devversionpkozlowski-opensource
authored andcommitted
build: migrate partial compliance tests to rules_js (angular#61865)
Migrates the partial compliance tests to `rules_js`. Also as part of this, we re-enable RBE to see if that fixed the issues, or in case they are already resolved from the RBE side. PR Close angular#61865
1 parent d86d11d commit 93c74ef

File tree

4 files changed

+41
-58
lines changed

4 files changed

+41
-58
lines changed

packages/compiler-cli/BUILD.bazel

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,30 @@ ts_project(
8282
"src/integrationtest/**/*.ts",
8383
],
8484
),
85-
interop_deps = [
86-
"//packages/compiler",
87-
"//packages/compiler-cli/private",
88-
"//packages/compiler-cli/src/ngtsc/core",
89-
"//packages/compiler-cli/src/ngtsc/core:api",
90-
"//packages/compiler-cli/src/ngtsc/diagnostics",
91-
"//packages/compiler-cli/src/ngtsc/docs",
92-
"//packages/compiler-cli/src/ngtsc/file_system",
93-
"//packages/compiler-cli/src/ngtsc/incremental",
94-
"//packages/compiler-cli/src/ngtsc/indexer",
95-
"//packages/compiler-cli/src/ngtsc/logging",
96-
"//packages/compiler-cli/src/ngtsc/perf",
97-
"//packages/compiler-cli/src/ngtsc/program_driver",
98-
"//packages/compiler-cli/src/ngtsc/reflection",
99-
"//packages/compiler-cli/src/ngtsc/shims",
100-
"//packages/compiler-cli/src/ngtsc/transform/jit",
101-
"//packages/compiler-cli/src/ngtsc/translator",
102-
"//packages/compiler-cli/src/ngtsc/typecheck",
103-
"//packages/compiler-cli/src/ngtsc/typecheck/api",
104-
"//packages/compiler-cli/src/ngtsc/util",
105-
],
10685
deps = [
10786
"//:node_modules/@types/yargs",
10887
"//:node_modules/chokidar",
10988
"//:node_modules/reflect-metadata",
11089
"//:node_modules/typescript",
90+
"//packages/compiler:compiler_rjs",
91+
"//packages/compiler-cli/private:private_rjs",
92+
"//packages/compiler-cli/src/ngtsc/core:api_rjs",
93+
"//packages/compiler-cli/src/ngtsc/core:core_rjs",
94+
"//packages/compiler-cli/src/ngtsc/diagnostics:diagnostics_rjs",
95+
"//packages/compiler-cli/src/ngtsc/docs:docs_rjs",
96+
"//packages/compiler-cli/src/ngtsc/file_system:file_system_rjs",
97+
"//packages/compiler-cli/src/ngtsc/incremental:incremental_rjs",
98+
"//packages/compiler-cli/src/ngtsc/indexer:indexer_rjs",
99+
"//packages/compiler-cli/src/ngtsc/logging:logging_rjs",
100+
"//packages/compiler-cli/src/ngtsc/perf:perf_rjs",
101+
"//packages/compiler-cli/src/ngtsc/program_driver:program_driver_rjs",
102+
"//packages/compiler-cli/src/ngtsc/reflection:reflection_rjs",
103+
"//packages/compiler-cli/src/ngtsc/shims:shims_rjs",
104+
"//packages/compiler-cli/src/ngtsc/transform/jit:jit_rjs",
105+
"//packages/compiler-cli/src/ngtsc/translator:translator_rjs",
106+
"//packages/compiler-cli/src/ngtsc/typecheck:typecheck_rjs",
107+
"//packages/compiler-cli/src/ngtsc/typecheck/api:api_rjs",
108+
"//packages/compiler-cli/src/ngtsc/util:util_rjs",
111109
],
112110
)
113111

packages/compiler-cli/test/compliance/partial/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ ts_project(
77
"cli.ts",
88
"generate_golden_partial.ts",
99
],
10-
interop_deps = [
11-
"//packages/compiler-cli/src/ngtsc/file_system",
12-
"//packages/compiler-cli/test/compliance/test_helpers",
13-
],
1410
visibility = ["//packages/compiler-cli/test/compliance:__subpackages__"],
11+
deps = [
12+
"//packages/compiler-cli/src/ngtsc/file_system:file_system_rjs",
13+
"//packages/compiler-cli/test/compliance/test_helpers:test_helpers_rjs",
14+
],
1515
)
1616

1717
exports_files([
Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
load("@aspect_rules_js//js:defs.bzl", "js_run_binary")
12
load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
2-
load("//tools:defaults.bzl", "nodejs_binary", "npm_package_bin")
3+
load("//tools/bazel:js_binary.bzl", "js_binary")
34

45
def partial_compliance_golden(filePath):
56
"""Creates the generate and testing targets for partial compile results.
@@ -9,50 +10,36 @@ def partial_compliance_golden(filePath):
910
path = filePath[:-len("/TEST_CASES.json")]
1011
generate_partial_name = "partial_%s" % path
1112
data = [
12-
"//packages/compiler-cli/test/compliance/partial:generate_golden_partial_lib",
13+
"//packages/compiler-cli/test/compliance/partial:generate_golden_partial_lib_rjs",
1314
"//packages/core:npm_package",
1415
"//packages:package_json",
1516
filePath,
1617
] + native.glob(["%s/*.ts" % path, "%s/**/*.html" % path, "%s/**/*.css" % path])
1718

18-
nodejs_binary(
19+
js_binary(
1920
name = generate_partial_name,
2021
testonly = True,
2122
data = data,
2223
visibility = [":__pkg__"],
2324
entry_point = "//packages/compiler-cli/test/compliance/partial:cli.js",
24-
templated_args = ["$(execpath %s)" % filePath],
25+
fixed_args = ["$(rootpath %s)" % filePath],
2526
)
2627

27-
nodejs_binary(
28-
name = generate_partial_name + ".debug",
29-
testonly = True,
30-
data = data,
31-
visibility = [":__pkg__"],
32-
entry_point = "//packages/compiler-cli/test/compliance/partial:cli.js",
33-
templated_args = ["--node_options=--inspect-brk", filePath],
34-
)
35-
36-
npm_package_bin(
28+
js_run_binary(
3729
name = "_generated_%s" % path,
3830
tool = generate_partial_name,
3931
testonly = True,
4032
outs = ["%s/_generated.js" % path],
41-
link_workspace_root = True,
42-
# Disable the linker and rely on patched resolution which works better on Windows
43-
# and is less prone to race conditions when targets build concurrently.
44-
args = ["--nobazel_run_linker", "$@"],
33+
# Relativize execpath to be relative to bazel-bin (bazel-out/k8-fastbuild/bin).
34+
args = ["../../../$(@)"],
4535
visibility = [":__pkg__"],
46-
# TODO(devversion): re-enable when we figure out the RBE hanging process issue.
47-
tags = ["no-remote-exec"],
48-
data = [],
36+
mnemonic = "GeneratePartialGolden",
37+
progress_message = "Generating partial golden: %{label}",
4938
)
5039

5140
generated_file_test(
5241
visibility = ["//visibility:public"],
5342
name = "%s.golden" % path,
5443
src = "//packages/compiler-cli/test/compliance/test_cases:%s/GOLDEN_PARTIAL.js" % path,
55-
# TODO(devversion): re-enable when we figure out the RBE hanging process issue.
56-
tags = ["no-remote-exec"],
5744
generated = "_generated_%s" % path,
5845
)

packages/compiler-cli/test/compliance/test_helpers/BUILD.bazel

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ ts_project(
66
srcs = glob(
77
["**/*.ts"],
88
),
9-
interop_deps = [
10-
"//packages:types",
11-
"//packages/compiler",
12-
"//packages/compiler-cli",
13-
"//packages/compiler-cli/src/ngtsc/file_system",
14-
"//packages/compiler-cli/src/ngtsc/file_system/testing",
15-
"//packages/compiler-cli/src/ngtsc/logging",
16-
"//packages/compiler-cli/src/ngtsc/sourcemaps",
17-
"//packages/compiler-cli/src/ngtsc/testing",
18-
],
199
visibility = [
2010
"//packages/compiler-cli/test/compliance:__subpackages__",
2111
],
2212
deps = [
2313
"//:node_modules/@bazel/runfiles",
2414
"//:node_modules/typescript",
15+
"//packages:types",
16+
"//packages/compiler:compiler_rjs",
17+
"//packages/compiler-cli:compiler-cli_rjs",
18+
"//packages/compiler-cli/src/ngtsc/file_system:file_system_rjs",
19+
"//packages/compiler-cli/src/ngtsc/file_system/testing:testing_rjs",
20+
"//packages/compiler-cli/src/ngtsc/logging:logging_rjs",
21+
"//packages/compiler-cli/src/ngtsc/sourcemaps:sourcemaps_rjs",
22+
"//packages/compiler-cli/src/ngtsc/testing:testing_rjs",
2523
],
2624
)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy