Skip to content

Commit 40a98e3

Browse files
committed
test(@angular-devkit/build-angular): test in debug mode for increased perf
1 parent 35526fd commit 40a98e3

File tree

3 files changed

+36
-25
lines changed

3 files changed

+36
-25
lines changed

integration/build_angular/BUILD.bazel

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ filegroup(
1111
),
1212
)
1313

14+
YARN_CACHE_FLAG = "--cache-folder ./.yarn_local_cache"
15+
1416
INTEGRATION_TESTS = [
1517
"app-shell",
1618
"browser-1",
@@ -45,22 +47,29 @@ INTEGRATION_TESTS = [
4547
"//packages/ngtools/webpack:npm_package_archive": "@ngtools/webpack",
4648
},
4749
commands = [
50+
"patch-package-json",
4851
# Workaround https://github.com/yarnpkg/yarn/issues/2165
4952
# Yarn will cache file://dist URIs and not update
50-
"rm -rf ./.yarn_local_cache",
51-
"mkdir .yarn_local_cache",
52-
"patch-package-json",
53-
"$(rootpath @nodejs//:yarn_bin) install --cache-folder ./.yarn_local_cache",
53+
"$(rootpath @nodejs//:yarn_bin) cache clean @angular-devkit/architect " + YARN_CACHE_FLAG,
54+
"$(rootpath @nodejs//:yarn_bin) cache clean @angular-devkit/build-angular " + YARN_CACHE_FLAG,
55+
"$(rootpath @nodejs//:yarn_bin) cache clean @angular-devkit/build-optimizer " + YARN_CACHE_FLAG,
56+
"$(rootpath @nodejs//:yarn_bin) cache clean @angular-devkit/build-webpack " + YARN_CACHE_FLAG,
57+
"$(rootpath @nodejs//:yarn_bin) cache clean @angular-devkit/core " + YARN_CACHE_FLAG,
58+
"$(rootpath @nodejs//:yarn_bin) cache clean @ngtools/webpack " + YARN_CACHE_FLAG,
59+
"$(rootpath @nodejs//:yarn_bin) install " + YARN_CACHE_FLAG,
5460
"$(rootpath @nodejs//:yarn_bin) test-" + test_name,
55-
"rm -rf ./.yarn_local_cache",
5661
],
5762
data = [
5863
"@nodejs//:yarn_bin",
5964
"@nodejs//:yarn_files",
6065
],
6166
test_files = ":build_angular_sources",
6267
size = "large",
63-
tags = ["exclusive"]
68+
tags = ["exclusive"],
69+
# This test contains a lot of node modules that can take up to 100s to install.
70+
# Instead of completely isolating the test and the cache, this one is run in-place so it
71+
# reuses the local node_modules and cache for all tests in this BUILD file.
72+
debug = True
6473
)
6574
for test_name in INTEGRATION_TESTS
6675
]

integration/build_angular/yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
# yarn lockfile v1
33

44

5-
"@angular-devkit/[email protected]", "@angular-devkit/architect@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz":
5+
"@angular-devkit/[email protected]", "@angular-devkit/architect@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz":
66
version "0.0.0"
7-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz#d3c85d7181b11ba4cd2357f70869d263e21e7296"
7+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz#d3c85d7181b11ba4cd2357f70869d263e21e7296"
88
dependencies:
99
"@angular-devkit/core" "0.0.0"
1010
rxjs "6.5.4"
1111

12-
"@angular-devkit/architect@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz":
12+
"@angular-devkit/architect@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz":
1313
version "0.0.0"
1414
uid d3c85d7181b11ba4cd2357f70869d263e21e7296
15-
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz#d3c85d7181b11ba4cd2357f70869d263e21e7296"
15+
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/architect/npm_package_archive.tar.gz#d3c85d7181b11ba4cd2357f70869d263e21e7296"
1616
dependencies:
1717
"@angular-devkit/core" "0.0.0"
1818
rxjs "6.5.4"
1919

20-
"@angular-devkit/build-angular@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz":
20+
"@angular-devkit/build-angular@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz":
2121
version "0.0.0"
22-
uid "840f4668452bb3fbcd0193b7282f727855ad9142"
23-
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz#840f4668452bb3fbcd0193b7282f727855ad9142"
22+
uid dd8aca592c550efd5076bca3c8fdf4822b6a8f0b
23+
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz#dd8aca592c550efd5076bca3c8fdf4822b6a8f0b"
2424
dependencies:
2525
"@angular-devkit/architect" "0.0.0"
2626
"@angular-devkit/build-optimizer" "0.0.0"
@@ -83,9 +83,9 @@
8383
webpack-subresource-integrity "1.4.0"
8484
worker-plugin "3.2.0"
8585

86-
"@angular-devkit/build-angular@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz":
86+
"@angular-devkit/build-angular@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz":
8787
version "0.0.0"
88-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz#840f4668452bb3fbcd0193b7282f727855ad9142"
88+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_angular/npm_package_archive.tar.gz#dd8aca592c550efd5076bca3c8fdf4822b6a8f0b"
8989
dependencies:
9090
"@angular-devkit/architect" "0.0.0"
9191
"@angular-devkit/build-optimizer" "0.0.0"
@@ -148,38 +148,38 @@
148148
webpack-subresource-integrity "1.4.0"
149149
worker-plugin "3.2.0"
150150

151-
"@angular-devkit/[email protected]", "@angular-devkit/build-optimizer@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_optimizer/npm_package_archive.tar.gz":
151+
"@angular-devkit/[email protected]", "@angular-devkit/build-optimizer@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_optimizer/npm_package_archive.tar.gz":
152152
version "0.0.0"
153-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_optimizer/npm_package_archive.tar.gz#0e3efaa3bee0d3f6177896c7fc0bf0a7eb9aac57"
153+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_optimizer/npm_package_archive.tar.gz#0e3efaa3bee0d3f6177896c7fc0bf0a7eb9aac57"
154154
dependencies:
155155
loader-utils "1.4.0"
156156
source-map "0.7.3"
157157
tslib "1.11.1"
158158
typescript "3.8.3"
159159
webpack-sources "1.4.3"
160160

161-
"@angular-devkit/[email protected]", "@angular-devkit/build-webpack@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_webpack/npm_package_archive.tar.gz":
161+
"@angular-devkit/[email protected]", "@angular-devkit/build-webpack@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_webpack/npm_package_archive.tar.gz":
162162
version "0.0.0"
163-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/build_webpack/npm_package_archive.tar.gz#0ff97f366df3f7e9516847c37900ecd6dab5c453"
163+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/build_webpack/npm_package_archive.tar.gz#647e743a8aceacd4aeeb78dd134850cfbeff88ac"
164164
dependencies:
165165
"@angular-devkit/architect" "0.0.0"
166166
"@angular-devkit/core" "0.0.0"
167167
rxjs "6.5.4"
168168

169-
"@angular-devkit/[email protected]", "@angular-devkit/core@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz":
169+
"@angular-devkit/[email protected]", "@angular-devkit/core@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz":
170170
version "0.0.0"
171-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz#c005055236edb49d53b9cbe8555d3d6729ca8a17"
171+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz#c005055236edb49d53b9cbe8555d3d6729ca8a17"
172172
dependencies:
173173
ajv "6.12.0"
174174
fast-json-stable-stringify "2.1.0"
175175
magic-string "0.25.6"
176176
rxjs "6.5.4"
177177
source-map "0.7.3"
178178

179-
"@angular-devkit/core@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz":
179+
"@angular-devkit/core@file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz":
180180
version "0.0.0"
181181
uid c005055236edb49d53b9cbe8555d3d6729ca8a17
182-
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz#c005055236edb49d53b9cbe8555d3d6729ca8a17"
182+
resolved "file:../../../../.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/angular_devkit/core/npm_package_archive.tar.gz#c005055236edb49d53b9cbe8555d3d6729ca8a17"
183183
dependencies:
184184
ajv "6.12.0"
185185
fast-json-stable-stringify "2.1.0"
@@ -1049,9 +1049,9 @@
10491049
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
10501050
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
10511051

1052-
"@ngtools/[email protected]", "@ngtools/webpack@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/ngtools/webpack/npm_package_archive.tar.gz":
1052+
"@ngtools/[email protected]", "@ngtools/webpack@file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/ngtools/webpack/npm_package_archive.tar.gz":
10531053
version "0.0.0"
1054-
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/dev-server.debug.sh.runfiles/angular_cli/packages/ngtools/webpack/npm_package_archive.tar.gz#af035a4ae6d4d0080b4b3a8186bff9428bbe869b"
1054+
resolved "file:/home/filipesilva/.cache/bazel/_bazel_filipesilva/e327cb0949caea626cba080635966a9f/execroot/angular_cli/bazel-out/k8-fastbuild/bin/integration/build_angular/server.sh.runfiles/angular_cli/packages/ngtools/webpack/npm_package_archive.tar.gz#af035a4ae6d4d0080b4b3a8186bff9428bbe869b"
10551055
dependencies:
10561056
"@angular-devkit/core" "0.0.0"
10571057
enhanced-resolve "4.1.1"

tools/npm_integration_test/npm_integration_test.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ def npm_integration_test(name, **kwargs):
145145
npm_packages = kwargs.pop("npm_packages", {})
146146
test_files = kwargs.pop("test_files", [])
147147
data = kwargs.pop("data", [])
148+
debug = kwargs.pop("debug", False)
148149

149150
_npm_integration_test_config(
150151
name = name + ".config",
@@ -157,6 +158,7 @@ def npm_integration_test(name, **kwargs):
157158
visibility = ["//visibility:private"],
158159
tags = ["manual"],
159160
testonly = True,
161+
debug = debug,
160162
)
161163

162164
# Config for debug target below

0 commit comments

Comments
 (0)