From 8450e0ab2f7dc34670bea021c0b2f11d6cb5872c Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 13 Jul 2018 06:35:23 -0700 Subject: [PATCH] build(bazel): fix broken travis CI (#24788) PR Close #24788 --- modules/benchmarks/src/largetable/render3/index.html | 8 +++++++- modules/benchmarks/src/largetable/render3/index.ts | 8 +++++++- protractor-perf.conf.js | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/benchmarks/src/largetable/render3/index.html b/modules/benchmarks/src/largetable/render3/index.html index cd7538e7d0..85dcfbb742 100644 --- a/modules/benchmarks/src/largetable/render3/index.html +++ b/modules/benchmarks/src/largetable/render3/index.html @@ -28,8 +28,14 @@ diff --git a/modules/benchmarks/src/largetable/render3/index.ts b/modules/benchmarks/src/largetable/render3/index.ts index 8b42c36d96..c8d774dbfe 100644 --- a/modules/benchmarks/src/largetable/render3/index.ts +++ b/modules/benchmarks/src/largetable/render3/index.ts @@ -27,4 +27,10 @@ export function main() { } } -main(); +const isBazel = location.pathname.indexOf('/all/') !== 0; +// isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run +// on Travis +// TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule +if (isBazel) { + main(); +} diff --git a/protractor-perf.conf.js b/protractor-perf.conf.js index d5e937bb09..409617f293 100644 --- a/protractor-perf.conf.js +++ b/protractor-perf.conf.js @@ -8,6 +8,9 @@ // Determine if we run under bazel const isBazel = !!process.env.RUNFILES; +// isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run +// on Travis +// TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule // Make sure that the command line is read as the first thing // as this could exit node if the help script should be printed.