This reverts commit b7f2a033df
.
PR Close #36798
This commit is contained in:

committed by
Andrew Kushnir

parent
ddfcf082ca
commit
cc71116ba6
@ -3,4 +3,5 @@ package(default_visibility = ["//visibility:public"])
|
||||
exports_files([
|
||||
"tsconfig-build.json",
|
||||
"tsconfig-e2e.json",
|
||||
"start-server.js",
|
||||
])
|
||||
|
29
modules/benchmarks/benchmark_test.bzl
Normal file
29
modules/benchmarks/benchmark_test.bzl
Normal file
@ -0,0 +1,29 @@
|
||||
load("//tools:defaults.bzl", "protractor_web_test_suite")
|
||||
|
||||
"""
|
||||
Macro that can be used to define a benchmark test. This differentiates from
|
||||
a normal Protractor test suite because we specify a custom "perf" configuration
|
||||
that sets up "@angular/benchpress". Benchmark test targets will not run on CI
|
||||
unless explicitly requested.
|
||||
"""
|
||||
|
||||
def benchmark_test(name, server, tags = [], **kwargs):
|
||||
protractor_web_test_suite(
|
||||
name = name,
|
||||
configuration = "//:protractor-perf.conf.js",
|
||||
data = [
|
||||
"//packages/benchpress",
|
||||
],
|
||||
on_prepare = "//modules/benchmarks:start-server.js",
|
||||
server = server,
|
||||
# Benchmark targets should not run on CI by default.
|
||||
tags = tags + [
|
||||
"manual",
|
||||
"no-remote-exec",
|
||||
],
|
||||
test_suite_tags = [
|
||||
"manual",
|
||||
"no-remote-exec",
|
||||
],
|
||||
**kwargs
|
||||
)
|
@ -9,7 +9,7 @@ load("//tools:defaults.bzl", "protractor_web_test_suite")
|
||||
def e2e_test(name, server, **kwargs):
|
||||
protractor_web_test_suite(
|
||||
name = name,
|
||||
on_prepare = "//dev-infra/benchmark/component_benchmark:start-server.js",
|
||||
on_prepare = "//modules/benchmarks:start-server.js",
|
||||
server = server,
|
||||
**kwargs
|
||||
)
|
||||
|
@ -15,7 +15,7 @@ ts_library(
|
||||
srcs = ["change_detection.perf-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
@ -26,7 +26,7 @@ ts_library(
|
||||
srcs = ["change_detection.e2e-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
import {$} from 'protractor';
|
||||
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
|
||||
|
||||
describe('change detection benchmark', () => {
|
||||
afterEach(verifyNoBrowserErrors);
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {$} from 'protractor';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
|
||||
|
||||
interface Worker {
|
||||
id: string;
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {$, browser} from 'protractor';
|
||||
import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {runBenchmark} from '../../../e2e_util/perf_util';
|
||||
|
||||
describe('class bindings perf', () => {
|
||||
it('should work for update', async () => {
|
||||
|
@ -1,7 +1,7 @@
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
|
||||
ng_module(
|
||||
name = "application_lib",
|
||||
@ -26,7 +26,7 @@ ts_library(
|
||||
srcs = ["expanding_rows.perf-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {$, browser} from 'protractor';
|
||||
import {runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {runBenchmark} from '../../../e2e_util/perf_util';
|
||||
|
||||
describe('benchmarks', () => {
|
||||
it('should work for create', async () => {
|
||||
|
@ -8,7 +8,7 @@ ts_library(
|
||||
srcs = ["js-web-frameworks.perf-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {$} from 'protractor';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
|
||||
|
||||
interface Worker {
|
||||
id: string;
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
||||
|
@ -8,7 +8,7 @@ ts_library(
|
||||
srcs = ["largeform.perf-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
@ -19,7 +19,7 @@ ts_library(
|
||||
srcs = ["largeform.e2e-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
import {$, By, element} from 'protractor';
|
||||
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
|
||||
|
||||
describe('largeform benchmark', () => {
|
||||
afterEach(verifyNoBrowserErrors);
|
||||
|
@ -8,7 +8,8 @@
|
||||
|
||||
import {$} from 'protractor';
|
||||
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
|
||||
import {runBenchmark} from '../../../e2e_util/perf_util';
|
||||
|
||||
interface Worker {
|
||||
id: string;
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -15,7 +15,7 @@ ts_library(
|
||||
srcs = ["largetable.perf-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
@ -26,7 +26,7 @@ ts_library(
|
||||
srcs = ["largetable.e2e-spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
import {$} from 'protractor';
|
||||
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
|
||||
|
||||
describe('largetable benchmark', () => {
|
||||
afterEach(verifyNoBrowserErrors);
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {$} from 'protractor';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {runBenchmark, verifyNoBrowserErrors} from '../../../e2e_util/perf_util';
|
||||
|
||||
interface Worker {
|
||||
id: string;
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,7 +1,7 @@
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
ng_module(
|
||||
|
@ -8,7 +8,7 @@ ts_library(
|
||||
srcs = ["styling_perf.spec.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
||||
|
@ -7,7 +7,8 @@
|
||||
*/
|
||||
|
||||
import {$, by, element} from 'protractor';
|
||||
import {openBrowser, runBenchmark, verifyNoBrowserErrors} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {openBrowser, verifyNoBrowserErrors} from '../../../e2e_util/e2e_util';
|
||||
import {runBenchmark} from '../../../e2e_util/perf_util';
|
||||
|
||||
/** List of possible scenarios that should be tested. */
|
||||
const SCENARIOS = [
|
||||
|
@ -15,7 +15,7 @@ ts_library(
|
||||
srcs = ["test_utils.ts"],
|
||||
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//dev-infra/benchmark/driver-utilities",
|
||||
"//modules/e2e_util",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -1,7 +1,7 @@
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
||||
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
ng_module(
|
||||
|
@ -1,5 +1,5 @@
|
||||
load("//tools:defaults.bzl", "ts_devserver", "ts_library")
|
||||
load("//dev-infra/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
|
||||
load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
|
||||
|
||||
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
|
||||
|
@ -8,7 +8,8 @@
|
||||
|
||||
import {browser} from 'protractor';
|
||||
|
||||
import {openBrowser, runBenchmark} from '../../../../dev-infra/benchmark/driver-utilities';
|
||||
import {openBrowser} from '../../../e2e_util/e2e_util';
|
||||
import {runBenchmark} from '../../../e2e_util/perf_util';
|
||||
|
||||
export function runTreeBenchmark({id, prepare, setup, work}: {
|
||||
id: string; prepare ? () : void; setup ? () : void; work(): void;
|
||||
|
18
modules/benchmarks/start-server.js
Normal file
18
modules/benchmarks/start-server.js
Normal file
@ -0,0 +1,18 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function(config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '-port', []);
|
||||
const processedConfig = await protractor.browser.getProcessedConfig();
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
return processedConfig.baseUrl = protractor.browser.baseUrl = serverUrl;
|
||||
};
|
@ -14,7 +14,7 @@
|
||||
"rxjs/*": ["../../node_modules/rxjs/*"],
|
||||
"@angular/*": ["../../packages/*"],
|
||||
"zone.js/*": ["../../packages/zone.js/*"],
|
||||
"dev_infra/*": ["../../dev-infra/*"]
|
||||
"e2e_util/*": ["../e2e_util/*"]
|
||||
},
|
||||
"rootDir": ".",
|
||||
"inlineSourceMap": true,
|
||||
@ -31,6 +31,5 @@
|
||||
"no-floating-promises": true,
|
||||
"no-unused-expression": true,
|
||||
"no-unused-variable": true
|
||||
},
|
||||
"include": ["../../dev-infra/benchmark/driver-utilities/"]
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user